fix: table name starts with number or lodash in mysql

taozhi8833998 · Nov 1, 2023 · 3e944d1 · 3e944d1
1 parent 5c043a6
commit 3e944d1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -1938,7 +1938,8 @@ join_op
   / (KW_INNER __)? KW_JOIN { return 'INNER JOIN'; }
 
 table_name
-  = dt:ident tail:(__ DOT __ ident)? {
+    = prefix:[_0-9]* part:ident tail:(__ DOT __ ident)? {
+      const dt = prefix ? `${prefix.join('')}${part}` : part
       const obj = { db: null, table: dt };
       if (tail !== null) {
         obj.db = dt;

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -2215,7 +2215,8 @@ join_op
   / (KW_INNER __)? KW_JOIN { return 'INNER JOIN'; }
 
 table_name
-  = dt:ident tail:(__ DOT __ ident)? {
+  = prefix:[_0-9]* part:ident tail:(__ DOT __ ident)? {
+      const dt = prefix ? `${prefix.join('')}${part}` : part
       const obj = { db: null, table: dt };
       if (tail !== null) {
         obj.db = dt;

diff --git a/test/cmd.spec.js b/test/cmd.spec.js
@@ -360,7 +360,7 @@ describe('Command SQL', () => {
         .to.equal(`SET @a.id = 123 ; SET @b.yy.xx = "mm"`);
     })
 
-    it('should support set keyword variable definde', () => {
+    it('should support set keyword variable defined', () => {
       const KEYWORDS = ['GLOBAL', 'SESSION', 'LOCAL', 'PERSIST', 'PERSIST_ONLY']
       KEYWORDS.forEach(keyword => {
         expect(getParsedSql(`set ${keyword} xx.yy = 123; set ${keyword} yy = "abc"`))

diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -818,6 +818,13 @@ describe('mysql', () => {
           "SELECT EXTRACT(YEAR_MONTH FROM '2023-10-10')"
         ]
       },
+      {
+        title: 'table name starts with number or lodash',
+        sql: [
+          'SELECT * FROM 2023t',
+          'SELECT * FROM `2023t`'
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo