Merge pull request #2175 from taozhi8833998/fix-column-name-digit-mysql

fix: column name can start with digit in mysql
taozhi8833998 · Oct 16, 2024 · 7af8a83 · 7af8a83
2 parents 6175609 + 5d48745
commit 7af8a83
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -2809,8 +2809,9 @@ primary
   / cast_expr
   / case_expr
   / interval_expr
-  / literal
+  / literal_basic
   / column_ref
+  / literal_numeric
   / param
   / LPAREN __ list:or_and_where_expr __ RPAREN {
     list.parentheses = true;
@@ -2936,6 +2937,7 @@ column
 
 column_name
   =  start:ident_start parts:column_part* { return start + parts.join(''); }
+  / start:digits parts:column_part+ { return start + parts.join(''); }
 
 ident_name
   =  start:ident_start parts:ident_part* { return start + parts.join(''); }
@@ -3338,16 +3340,18 @@ signedness
   = KW_SIGNED
   / KW_UNSIGNED
 
-literal
+literal_basic
   = b:('binary'i / '_binary'i)? __ s:literal_string ca:(__ collate_expr)? {
     if (b) s.prefix = b.toLowerCase()
     if (ca) s.suffix = { collate: ca[1] }
     return s
   }
-  / literal_numeric
   / literal_bool
   / literal_null
   / literal_datetime
+
+literal
+  = literal_basic / literal_numeric
 
 literal_list
   = head:literal tail:(__ COMMA __ literal)* {

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -3086,8 +3086,9 @@ primary
   / cast_expr
   / case_expr
   / interval_expr
-  / literal
+  / literal_basic
   / column_ref
+  / literal_numeric
   / param
   / LPAREN __ list:or_and_where_expr __ RPAREN {
     list.parentheses = true
@@ -3228,6 +3229,7 @@ column
 
 column_name
   =  start:ident_start parts:column_part* { return start + parts.join(''); }
+  / start:digits parts:column_part+ { return start + parts.join(''); }
 
 ident_name
   =  start:ident_start parts:ident_part* { return start + parts.join(''); }
@@ -3629,16 +3631,19 @@ signedness
   = KW_SIGNED
   / KW_UNSIGNED
 
-literal
+literal_basic
   = b:('binary'i / '_binary'i)? __ s:literal_string ca:(__ collate_expr)? {
     if (b) s.prefix = b.toLowerCase()
     if (ca) s.suffix = { collate: ca[1] }
     return s
   }
-  / literal_numeric
   / literal_bool
   / literal_null
   / literal_datetime
+
+literal
+  = literal_basic / literal_numeric
+
 
 literal_list
   = head:literal tail:(__ COMMA __ literal)* {

diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -1130,6 +1130,13 @@ describe('mysql', () => {
           'CREATE TABLE `visits` (`done` BIT)'
         ]
       },
+      {
+        title: 'column name start with digit',
+        sql: [
+          'select 4k_pic from table1',
+          'SELECT `4k_pic` FROM `table1`'
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo