fix: multiple joins in mysql and mariadb

Author: taozhi8833998

pegjs/mariadb.pegjs

@@ -2356,12 +2356,12 @@ table_ref
 
 
 table_join
-  = op:join_op __ t:table_base __ KW_USING __ LPAREN __ head:ident_without_kw_type tail:(__ COMMA __ ident_without_kw_type)* __ RPAREN {
+  = op:join_op __ t:(table_base / table_ref_list) __ KW_USING __ LPAREN __ head:ident_without_kw_type tail:(__ COMMA __ ident_without_kw_type)* __ RPAREN {
       t.join = op;
       t.using = createList(head, tail);
       return t;
     }
-  / op:join_op __ t:table_base __ expr:on_clause? {
+  / op:join_op __ t:(table_base / table_ref_list) __ expr:on_clause? {
       t.join = op;
       t.on   = expr;
       return t;

pegjs/mysql.pegjs

@@ -2619,12 +2619,12 @@ table_ref
 
 
 table_join
-  = op:join_op __ t:table_base __ KW_USING __ LPAREN __ head:ident_without_kw_type tail:(__ COMMA __ ident_without_kw_type)* __ RPAREN {
+  = op:join_op __ t:(table_base / table_ref_list) __ KW_USING __ LPAREN __ head:ident_without_kw_type tail:(__ COMMA __ ident_without_kw_type)* __ RPAREN {
       t.join = op;
       t.using = createList(head, tail);
       return t;
     }
-  / op:join_op __ t:table_base __ expr:on_clause? {
+  / op:join_op __ t:(table_base / table_ref_list) __ expr:on_clause? {
       t.join = op;
       t.on = expr;
       return t;

src/tables.js

@@ -184,8 +184,9 @@ function tablesToSQL(tables) {
     const joinExpr = tables[i]
     const { on, using, join } = joinExpr
     const str = []
+    const isTables = Array.isArray(joinExpr) || Object.hasOwnProperty.call(joinExpr, 'joins')
     str.push(join ? ` ${toUpper(join)}` : ',')
-    str.push(tableToSQL(joinExpr))
+    str.push(isTables ? tablesToSQL(joinExpr) : tableToSQL(joinExpr))
     str.push(commonOptionConnector('ON', exprToSQL, on))
     if (using) str.push(`USING (${using.map(literalToSQL).join(', ')})`)
     clauses.push(str.filter(hasVal).join(' '))

test/mysql-mariadb.spec.js

@@ -1270,6 +1270,20 @@ describe('mysql', () => {
           'SELECT * FROM `T` WHERE `date` BETWEEN `start` AND `start` + INTERVAL (`duration` + 1) DAY'
         ]
       },
+      {
+        title: 'join using clause',
+        sql: [
+          'SELECT * FROM A JOIN (B JOIN C USING (x)) USING (y)',
+          'SELECT * FROM `A` INNER JOIN (`B` INNER JOIN `C` USING (x)) USING (y)'
+        ]
+      },
+      {
+        title: 'join on clause',
+        sql: [
+          'SELECT * FROM A JOIN (B JOIN C ON B.x = C.x) ON A.y = C.y',
+          'SELECT * FROM `A` INNER JOIN (`B` INNER JOIN `C` ON `B`.`x` = `C`.`x`) ON `A`.`y` = `C`.`y`'
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo
@@ -1280,7 +1294,7 @@ describe('mysql', () => {
         expect(getParsedSql(sql[0], mariadb)).to.equal(sql[1])
       })
     })
-
+    
     it('should throw error when args is not right', () => {
       let sql = `select convert(json_unquote(json_extract('{"thing": "252"}', "$.thing")));`
       expect(parser.astify.bind(parser, sql)).to.throw('Expected "!=", "#", "#-", "#>", "#>>", "%", "&", "&&", "*", "+", ",", "-", "--", "->", "->>", "/", "/*", "<", "<<", "<=", "<>", "<@", "=", ">", ">=", ">>", "?", "?&", "?|", "@>", "AND", "BETWEEN", "IN", "IS", "LIKE", "NOT", "ON", "OR", "OVER", "REGEXP", "RLIKE", "USING", "XOR", "^", "div", "mod", "|", "||", or [ \\t\\n\\r] but ")" found.')

test/update.spec.js

@@ -238,20 +238,22 @@ describe('update', () => {
       "update::employees::salary"
     ])
   })
-  sql = `UPDATE empdb.employees t1 INNER JOIN (select t2.percentage,t2.performance from empdb.merits t2) as t3 ON t1.performance = t3.performance SET t1.salary = t1.salary + t1.salary * t3.percentage;`
-  ast = parser.parse(sql)
-  expect(ast.tableList).to.eql(["select::empdb::merits", "update::empdb::employees"])
-  expect(ast.columnList).to.eql([
-    "select::merits::percentage",
-    "select::merits::performance",
-    "select::employees::performance",
-    "select::t3::performance",
-    "select::employees::salary",
-    "select::t3::percentage",
-    "update::employees::salary"
-  ])
-  sql = `DELETE t1 FROM t1 INNER JOIN  t2 ON t2.ref = t1.id;`
-  ast = parser.parse(sql)
-  expect(ast.tableList).to.eql(["delete::null::t1","select::null::t2"])
-  expect(ast.columnList).to.eql(["select::t2::ref", "select::t1::id", "delete::t1::(.*)" ])
+  it('should parse update statement', () => {
+    sql = `UPDATE empdb.employees t1 INNER JOIN (select t2.percentage,t2.performance from empdb.merits t2) as t3 ON t1.performance = t3.performance SET t1.salary = t1.salary + t1.salary * t3.percentage;`
+    ast = parser.parse(sql)
+    expect(ast.tableList).to.eql(["select::empdb::merits", "update::empdb::employees"])
+    expect(ast.columnList).to.eql([
+      "select::merits::percentage",
+      "select::merits::performance",
+      "select::employees::performance",
+      "select::t3::performance",
+      "select::employees::salary",
+      "select::t3::percentage",
+      "update::employees::salary"
+    ])
+    sql = `DELETE t1 FROM t1 INNER JOIN  t2 ON t2.ref = t1.id;`
+    ast = parser.parse(sql)
+    expect(ast.tableList).to.eql(["delete::null::t1", "select::null::t2"])
+    expect(ast.columnList).to.eql(["select::t2::ref", "select::t1::id", "delete::t1::(.*)"])
+  })
 });