Merge pull request #2085 from taozhi8833998/fix-bugs

refactor: fix location different for same sql in different dialect
taozhi8833998 · Aug 28, 2024 · 7b38b2b · 7b38b2b
2 parents 1936591 + 1339522
commit 7b38b2b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -2274,12 +2274,13 @@ column_list_item
         ...getLocationObject(),
       };
     }
-  / table:(ident __ DOT)? __ STAR {
+  / tbl:(ident __ DOT)? __ STAR {
+      const table = tbl && tbl[0] || null
       columnList.add(`select::${table}::(.*)`);
       return {
         expr: {
           type: 'column_ref',
-          table: table && table[0] || null,
+          table,
           column: '*'
         },
         as: null,
@@ -3119,6 +3120,19 @@ column_ref
         ...getLocationObject(),
       };
     }
+  / tbl:(ident __ DOT)? __ STAR {
+    const table =  tbl && tbl[0] || null
+      columnList.add(`select::${table}::(.*)`);
+      return {
+        expr: {
+          type: 'column_ref',
+          table,
+          column: '*'
+        },
+        as: null,
+        ...getLocationObject(),
+      };
+    }
   / col:column {
       columnList.add(`select::null::${col}`);
       return {

diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -4027,7 +4027,7 @@ cast_expr
       ...c,
     }
   }
-  / e:(func_call/ aggr_func / window_func  / case_expr / interval_expr / literal / column_ref_array_index / param) __ c:cast_double_colon? {
+  / e:(func_call/ aggr_func / window_func / case_expr / interval_expr / literal / column_ref_array_index / param) __ c:cast_double_colon? {
     /* => {
         type: 'cast';
         expr: literal | aggr_func | func_call | case_expr | interval_expr | column_ref | param