Merge pull request #2243 from taozhi8833998/fix-double-quoted-table

fix: double quoted table mentions in athena and tsql
taozhi8833998 · Nov 29, 2024 · 3d1d73d · 3d1d73d
2 parents ac394b1 + 598a604
commit 3d1d73d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/pegjs/athena.pegjs b/pegjs/athena.pegjs
@@ -2242,7 +2242,7 @@ literal_string
         value: ca[1].join('')
       };
     }
-  / ca:("\"" single_quote_char* "\"") {
+  / ca:("\"" single_quote_char* "\"") !DOT {
       return {
         type: 'double_quote_string',
         value: ca[1].join('')

diff --git a/pegjs/transactsql.pegjs b/pegjs/transactsql.pegjs
@@ -2838,7 +2838,7 @@ literal_string
         value: ca[1].join(''),
       };
     }
-  / ca:("\"" single_quote_char* "\"") {
+  / ca:("\"" single_quote_char* "\"") !DOT {
       return {
         type: 'double_quote_string',
         value: ca[1].join('')

diff --git a/test/athena.spec.js b/test/athena.spec.js
@@ -338,4 +338,11 @@ describe('athena', () => {
     GROUP BY id`
     expect(getParsedSql(sql)).to.be.equal("SELECT `id`, array_agg(json_extract_scalar(`elem`, '$.value')) AS `er_teams` FROM `bronze_prod`.`jira_issues` CROSS JOIN UNNEST(CAST(json_extract(json_parse(`fields`), '$.customfield_10100') AS ARRAY(JSON))) AS t(`elem`) GROUP BY `id`")
   })
+  it('should support double quoted table mentions', () => {
+    const sql = `SELECT
+    "my_table"."my_column"
+  FROM
+    "my_table"`
+    expect(getParsedSql(sql)).to.be.equal('SELECT `my_table`.`my_column` FROM `my_table`')
+  })
 })
diff --git a/test/transactsql.spec.js b/test/transactsql.spec.js
@@ -389,6 +389,13 @@ describe('transactsql', () => {
         'SELECT [a].[username] AS [姓名] FROM [users] AS [a]'
       ]
     },
+    {
+      title: 'double quoted table mentions',
+      sql: [
+        'SELECT	a.username FROM	"users" a',
+        'SELECT [a].[username] FROM [users] AS [a]'
+      ]
+    },
   ]
   SQL_LIST.forEach(sqlInfo => {
     const { title, sql } = sqlInfo