Merge pull request taozhi8833998#2112 from taozhi8833998/fix-column-keyword-postgresql

fix: reserved keyword as column name in postgresql

Author: taozhi8833998

pegjs/postgresql.pegjs

@@ -3256,7 +3256,7 @@ column_list_item
       tail: tail && tail[0] && { operator: tail[0][1], expr: tail[0][3] },
     }
   }
-  / tbl:ident_type __ DOT pro:(ident_type __ DOT)? __ STAR {
+  / tbl:ident_type __ DOT pro:(ident_without_kw_type __ DOT)? __ STAR {
       // => { expr: column_ref; as: null; }
       const mid = pro && pro[0]
       let schema
@@ -4409,7 +4409,7 @@ column_ref
           column: '*'
       }
     }
-  / schema:ident tbl:(__ DOT __ ident) col:(__ DOT __ column_type) {
+  / schema:ident tbl:(__ DOT __ ident) col:(__ DOT __ column_without_kw_type) {
     /* => {
         type: 'column_ref';
         schema: string;
@@ -4424,7 +4424,7 @@ column_ref
         column: { expr: col[3] }
       };
     }
-  / tbl:ident __ DOT __ col:column_type {
+  / tbl:ident __ DOT __ col:column_without_kw_type {
       /* => {
         type: 'column_ref';
         table: ident;

test/postgres.spec.js

@@ -1936,6 +1936,13 @@ describe('Postgres', () => {
           'CREATE TABLE "User" ("id" SERIAL NOT NULL, CONSTRAINT "User_pkey" PRIMARY KEY ("id"))'
         ]
       },
+      {
+        title: 'reserved keyword as column name',
+        sql: [
+          'select meeting.end from meeting',
+          'SELECT "meeting".end FROM "meeting"'
+        ]
+      },
     ]
     neatlyNestTestedSQL(SQL_LIST)
   })