Merge pull request #2553 from taozhi8833998/fix-with-clause-mysql

fix: with clause before select stmt in mysql

Author: taozhi8833998

pegjs/mysql.pegjs

@@ -2289,7 +2289,7 @@ with_clause
     }
 
 cte_definition
-  = name:(literal_string / ident_name / table_name) __ columns:cte_column_definition? __ KW_AS __ LPAREN __ stmt:set_op_stmt __ RPAREN {
+  = name:(literal_string / ident_name / table_name) __ columns:cte_column_definition? __ KW_AS __ LPAREN __ stmt:(value_clause / set_op_stmt) __ RPAREN {
     if (typeof name === 'string') name = { type: 'default', value: name }
     if (name.table) name = { type: 'default', value: name.table }
     return { name, stmt, columns };

src/with.js

@@ -1,6 +1,6 @@
 import { columnRefToSQL } from './column'
 import { exprToSQL } from './expr'
-import { identifierToSql, literalToSQL } from './util'
+import { commonOptionConnector, identifierToSql, literalToSQL } from './util'
 
 /**
  * @param {Array<Object>} withExpr
@@ -11,7 +11,8 @@ function withToSQL(withExpr) {
   const withExprStr = withExpr.map(cte => {
     const { name, stmt, columns } = cte
     const column = Array.isArray(columns) ? `(${columns.map(columnRefToSQL).join(', ')})` : ''
-    return `${name.type === 'default' ? identifierToSql(name.value) : literalToSQL(name)}${column} AS (${exprToSQL(stmt)})`
+    const expr = commonOptionConnector(stmt.type === 'values' ? 'VALUES' : '', exprToSQL, stmt)
+    return `${name.type === 'default' ? identifierToSql(name.value) : literalToSQL(name)}${column} AS (${expr})`
   }).join(', ')
 
   return `WITH ${isRecursive}${withExprStr}`

test/mysql-mariadb.spec.js

@@ -1326,6 +1326,13 @@ describe('mysql', () => {
           "SELECT `crème` AS `brûlée` FROM `café` WHERE `âtre` = 'Molière'"
         ]
       },
+      {
+        title: 'with clause',
+        sql: [
+          "WITH T AS (VALUES ROW('foobar')) SELECT * FROM T",
+          "WITH `T` AS (VALUES ROW('foobar')) SELECT * FROM `T`"
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo