Merge pull request #2255 from taozhi8833998/fix-column-list

fix: column list include function name
taozhi8833998 · Dec 7, 2024 · 6f4b18f · 6f4b18f
2 parents dbe81e6 + fd0ab2b
commit 6f4b18f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -4547,7 +4547,7 @@ column_ref
         column: { expr: col }
       };
     }
-  / col:column_type {
+  / col:column_type !LPAREN {
     // => IGNORE
       columnList.add(`select::null::${col.value}`);
       return {

diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -4025,7 +4025,7 @@ column_ref
         column: { expr: col }
       };
     }
-  / col:column_type {
+  / col:column_type !LPAREN {
     // => IGNORE
       columnList.add(`select::null::${col.value}`);
       return {

diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -3442,7 +3442,7 @@ column_ref
         ...getLocationObject()
       };
     }
-  / col:column_type {
+  / col:column_type !LPAREN {
     // => IGNORE
       columnList.add(`select::null::${col.value}`);
       return {

diff --git a/test/postgres.spec.js b/test/postgres.spec.js
@@ -2116,6 +2116,9 @@ describe('Postgres', () => {
         }
       })
       expect(parser.sqlify(ast.ast, opt)).to.be.equals('SELECT "col1" + "col2" FROM "t1"')
+      sql = 'SELECT SUM("source"."point" + "other_source"."other_point") FROM foo';
+      ast = parser.parse(sql, opt)
+      expect(ast.columnList).to.be.eql(['select::source::point', 'select::other_source::other_point'])
     })
 
     it('should support conflict be empty', () => {