Merge pull request #1712 from taozhi8833998/fix-crosstab-pg

fix: crosstab in pg

Author: taozhi8833998

pegjs/postgresql.pegjs

@@ -4312,15 +4312,15 @@ trim_func_clause
   }
 
 tablefunc_clause
-  = 'crosstab'i __ LPAREN __ s:literal_list __ RPAREN __ KW_AS __ 'final_result' LPAREN __ cds:column_data_type_list __ RPAREN {
+  = 'crosstab'i __ LPAREN __ s:expr_list __ RPAREN __ KW_AS __ n:ident_name __ LPAREN __ cds:column_data_type_list __ RPAREN {
     // => { type: 'tablefunc'; name: crosstab; args: expr_list; as: func_call }
     return {
       type: 'tablefunc',
       name: 'crosstab',
-      args: { type: 'expr_list', value: s },
+      args: s,
       as: {
         type: 'function',
-        name: 'final_result',
+        name: n,
         args: { type: 'expr_list', value: cds.map(v => ({ ...v, type: 'column_definition' })) },
       }
     }

test/postgres.spec.js

@@ -1582,8 +1582,8 @@ describe('Postgres', () => {
       {
         title: 'crosstab tablefunc',
         sql: [
-          `SELECT * FROM crosstab( 'select student, subject, evaluation_result from evaluations order by 1,2') AS final_result(Student TEXT, Geography NUMERIC,History NUMERIC,Language NUMERIC,Maths NUMERIC,Music NUMERIC);`,
-          `SELECT * FROM crosstab('select student, subject, evaluation_result from evaluations order by 1,2') AS final_result("Student" TEXT, "Geography" NUMERIC, "History" NUMERIC, "Language" NUMERIC, "Maths" NUMERIC, "Music" NUMERIC)`
+          `SELECT * FROM crosstab( 'select student, subject, evaluation_result from evaluations order by 1,2', $$VALUES ('t'::text), ('f'::text)$$) AS final_result(Student TEXT, Geography NUMERIC,History NUMERIC,Language NUMERIC,Maths NUMERIC,Music NUMERIC);`,
+          `SELECT * FROM crosstab('select student, subject, evaluation_result from evaluations order by 1,2', $$VALUES ('t'::text), ('f'::text)$$) AS final_result("Student" TEXT, "Geography" NUMERIC, "History" NUMERIC, "Language" NUMERIC, "Maths" NUMERIC, "Music" NUMERIC)`
         ]
       },
     ]