fix: with cte recursive in all db

taozhi8833998 · taozhi8833998 · commit c407716d84e6 · 2025-07-22T09:50:07.000+08:00
diff --git a/pegjs/athena.pegjs b/pegjs/athena.pegjs
@@ -971,9 +971,9 @@ with_clause
   = KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/db2.pegjs b/pegjs/db2.pegjs
@@ -1021,9 +1021,9 @@ with_clause
   = KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/flinksql.pegjs b/pegjs/flinksql.pegjs
@@ -1623,10 +1623,9 @@ with_clause
       // => cte_definition[]
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
-      // => [cte_definition & {recursive: true; }]
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/hive.pegjs b/pegjs/hive.pegjs
@@ -957,9 +957,9 @@ with_clause
   = KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -2055,9 +2055,9 @@ with_clause
   = KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -2283,9 +2283,9 @@ with_clause
   = KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/noql.pegjs b/pegjs/noql.pegjs
@@ -2659,10 +2659,9 @@ with_clause
       // => cte_definition[]
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
-      // => [cte_definition & { recursive: true; }]
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -3290,10 +3290,10 @@ with_clause
       // => cte_definition[]
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
-      // => [cte_definition & { recursive: true; }]
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
+    // => (cte_definition & { recursive?: true; })[]
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -2687,10 +2687,9 @@ with_clause
       // => cte_definition[]
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
-      // => [cte_definition & { recursive: true; }]
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/snowflake.pegjs b/pegjs/snowflake.pegjs
@@ -2006,10 +2006,9 @@ with_clause
       // => cte_definition[]
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
-      // => [cte_definition & { recursive: true; }]
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/sqlite.pegjs b/pegjs/sqlite.pegjs
@@ -1391,9 +1391,9 @@ with_clause
   = KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/transactsql.pegjs b/pegjs/transactsql.pegjs
@@ -1411,9 +1411,9 @@ with_clause
   = KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -2035,10 +2035,9 @@ with_clause
       // => cte_definition[]
       return createList(head, tail);
     }
-  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {
-      // => [cte_definition & { recursive: true; }]
+  / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {
       cte.recursive = true;
-      return [cte]
+      return createList(cte, tail);
     }
 
 cte_definition
diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -1291,6 +1291,20 @@ describe('mysql', () => {
           'SELECT * FROM `T1` WHERE `a` = `b` IN (SELECT `flag` FROM `T2`)'
         ]
       },
+      {
+        title: 'with cte recursive',
+        sql: [
+          `WITH RECURSIVE
+          T AS (
+              SELECT 'foo'
+          ),
+          U AS (
+              SELECT 'bar'
+          )
+          SELECT * FROM T, U`,
+          "WITH RECURSIVE `T` AS (SELECT 'foo'), `U` AS (SELECT 'bar') SELECT * FROM `T`, `U`"
+        ]
+      }
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo

Original file line number	Diff line number	Diff line change
`@@ -971,9 +971,9 @@ with_clause`
`971`	`971`	`= KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {`
`972`	`972`	`return createList(head, tail);`
`973`	`973`	`}`
`974`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
	`974`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`975`	`975`	`cte.recursive = true;`
`976`		`- return [cte]`
	`976`	`+ return createList(cte, tail);`
`977`	`977`	`}`
`978`	`978`
`979`	`979`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -1021,9 +1021,9 @@ with_clause`
`1021`	`1021`	`= KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {`
`1022`	`1022`	`return createList(head, tail);`
`1023`	`1023`	`}`
`1024`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
	`1024`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`1025`	`1025`	`cte.recursive = true;`
`1026`		`- return [cte]`
	`1026`	`+ return createList(cte, tail);`
`1027`	`1027`	`}`
`1028`	`1028`
`1029`	`1029`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -1623,10 +1623,9 @@ with_clause`
`1623`	`1623`	`// => cte_definition[]`
`1624`	`1624`	`return createList(head, tail);`
`1625`	`1625`	`}`
`1626`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
`1627`		`- // => [cte_definition & {recursive: true; }]`
	`1626`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`1628`	`1627`	`cte.recursive = true;`
`1629`		`- return [cte]`
	`1628`	`+ return createList(cte, tail);`
`1630`	`1629`	`}`
`1631`	`1630`
`1632`	`1631`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -957,9 +957,9 @@ with_clause`
`957`	`957`	`= KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {`
`958`	`958`	`return createList(head, tail);`
`959`	`959`	`}`
`960`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
	`960`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`961`	`961`	`cte.recursive = true;`
`962`		`- return [cte]`
	`962`	`+ return createList(cte, tail);`
`963`	`963`	`}`
`964`	`964`
`965`	`965`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -2055,9 +2055,9 @@ with_clause`
`2055`	`2055`	`= KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {`
`2056`	`2056`	`return createList(head, tail);`
`2057`	`2057`	`}`
`2058`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
	`2058`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`2059`	`2059`	`cte.recursive = true;`
`2060`		`- return [cte]`
	`2060`	`+ return createList(cte, tail);`
`2061`	`2061`	`}`
`2062`	`2062`
`2063`	`2063`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -2283,9 +2283,9 @@ with_clause`
`2283`	`2283`	`= KW_WITH __ head:cte_definition tail:(__ COMMA __ cte_definition)* {`
`2284`	`2284`	`return createList(head, tail);`
`2285`	`2285`	`}`
`2286`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
	`2286`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`2287`	`2287`	`cte.recursive = true;`
`2288`		`- return [cte]`
	`2288`	`+ return createList(cte, tail);`
`2289`	`2289`	`}`
`2290`	`2290`
`2291`	`2291`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -2659,10 +2659,9 @@ with_clause`
`2659`	`2659`	`// => cte_definition[]`
`2660`	`2660`	`return createList(head, tail);`
`2661`	`2661`	`}`
`2662`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
`2663`		`- // => [cte_definition & { recursive: true; }]`
	`2662`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`2664`	`2663`	`cte.recursive = true;`
`2665`		`- return [cte]`
	`2664`	`+ return createList(cte, tail);`
`2666`	`2665`	`}`
`2667`	`2666`
`2668`	`2667`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -3290,10 +3290,10 @@ with_clause`
`3290`	`3290`	`// => cte_definition[]`
`3291`	`3291`	`return createList(head, tail);`
`3292`	`3292`	`}`
`3293`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
`3294`		`- // => [cte_definition & { recursive: true; }]`
	`3293`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
	`3294`	`+ // => (cte_definition & { recursive?: true; })[]`
`3295`	`3295`	`cte.recursive = true;`
`3296`		`- return [cte]`
	`3296`	`+ return createList(cte, tail);`
`3297`	`3297`	`}`
`3298`	`3298`
`3299`	`3299`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -2687,10 +2687,9 @@ with_clause`
`2687`	`2687`	`// => cte_definition[]`
`2688`	`2688`	`return createList(head, tail);`
`2689`	`2689`	`}`
`2690`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
`2691`		`- // => [cte_definition & { recursive: true; }]`
	`2690`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`2692`	`2691`	`cte.recursive = true;`
`2693`		`- return [cte]`
	`2692`	`+ return createList(cte, tail);`
`2694`	`2693`	`}`
`2695`	`2694`
`2696`	`2695`	`cte_definition`
Original file line number	Diff line number	Diff line change
`@@ -2006,10 +2006,9 @@ with_clause`
`2006`	`2006`	`// => cte_definition[]`
`2007`	`2007`	`return createList(head, tail);`
`2008`	`2008`	`}`
`2009`		`- / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition {`
`2010`		`- // => [cte_definition & { recursive: true; }]`
	`2009`	`+ / __ KW_WITH __ KW_RECURSIVE __ cte:cte_definition tail:(__ COMMA __ cte_definition)* {`
`2011`	`2010`	`cte.recursive = true;`
`2012`		`- return [cte]`
	`2011`	`+ return createList(cte, tail);`
`2013`	`2012`	`}`
`2014`	`2013`
`2015`	`2014`	`cte_definition`