happy-sql 2.0.7 → 2.1.0

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/with-named-insert-fix.sql

@@ -1,12 +1,12 @@
 WITH
     call AS (
         INSERT INTO CallExpression (file, parent_id) VALUES (:file, :parent_id)
-RETURNING id
+        RETURNING id
     ),
     member AS (
         INSERT INTO MemberExpression (file, parent_id) SELECT :file, id
-FROM call
-RETURNING id
+        FROM call
+        RETURNING id
     )
 INSERT INTO Identifier (file, name, parent_id) SELECT :file, 'isNaN', id
 FROM member

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/with-named-select-fix.sql

@@ -0,0 +1,8 @@
+WITH
+    recent AS (
+        SELECT id
+        FROM users
+        WHERE kind = 'const'
+    )
+SELECT id
+FROM recent

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/with-named-select.js

@@ -0,0 +1,19 @@
+[
+    withNamed(
+        recent = select(
+            id,
+            from(
+                users,
+                where(
+                    kind === 'const',
+                ),
+            ),
+        ),
+        select(
+            id,
+            from(
+                recent,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/withNamed-fix.sql

@@ -1,12 +1,12 @@
 WITH
     call AS (
         INSERT INTO CallExpression (parent_id) VALUES (:parent_id)
-RETURNING id
+        RETURNING id
     ),
     member AS (
         INSERT INTO MemberExpression (parent_id) SELECT id
-FROM call
-RETURNING id
+        FROM call
+        RETURNING id
     )
 INSERT INTO Identifier (name, parent_id) SELECT 'x', id
 FROM member

package/lib/printer/visitors/call-expression/clauses/with-named/with-named.js

@@ -1,20 +1,37 @@
 const isAssignment = (arg) => arg.node.type === 'AssignmentExpression';
 
-export const withNamed = (path, {write, traverse}) => {
+export const withNamed = (path, {write, indent, traverse}) => {
     const args = path.get('arguments');
     const namedQueries = args.filter(isAssignment);
     const finalStatement = args.at(-1);
     
-    write('WITH\n');
+    write('WITH');
+    write.newline();
     const last = namedQueries.length - 1;
     
     for (const [i, query] of namedQueries.entries()) {
-        write('    ');
+        indent.inc();
+        write.indent();
+        indent.dec();
         write(query.get('left').node.name);
-        write(' AS (\n        ');
+        write(' AS (');
+        write.newline();
+        indent.inc();
+        indent.inc();
+        write.indent();
         traverse(query.get('right'));
-        write('\n    )');
-        write(i < last ? ',\n' : '\n');
+        indent.dec();
+        indent.dec();
+        write.newline();
+        indent.inc();
+        write.indent();
+        indent.dec();
+        write(')');
+        
+        if (i < last)
+            write(',');
+        
+        write.newline();
     }
     
     traverse(finalStatement);

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-fix.sql

@@ -0,0 +1,10 @@
+WITH RECURSIVE
+    numbers(value) AS (
+        SELECT 1
+        UNION ALL
+        SELECT value + 1
+        FROM numbers
+        WHERE value < 10
+    )
+SELECT value
+FROM numbers

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-multi-fix.sql

@@ -0,0 +1,14 @@
+WITH RECURSIVE
+    t AS (
+        SELECT 1
+        UNION ALL
+        SELECT 2
+    ),
+    u(a, b) AS (
+        SELECT 1, 2
+        UNION ALL
+        SELECT a, b
+        FROM t
+    )
+SELECT a, b
+FROM u

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-multi.js

@@ -0,0 +1,38 @@
+[
+    withRecursive(
+        t(
+            unionAll(
+                select(
+                    1,
+                ),
+                select(
+                    2,
+                ),
+            ),
+        ),
+        u(
+            'a',
+            'b',
+            unionAll(
+                select(
+                    1,
+                    2,
+                ),
+                select(
+                    a,
+                    b,
+                    from(
+                        t,
+                    ),
+                ),
+            ),
+        ),
+        select(
+            a,
+            b,
+            from(
+                u,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-no-columns-fix.sql

@@ -0,0 +1,8 @@
+WITH RECURSIVE
+    t AS (
+        SELECT 1
+        UNION ALL
+        SELECT 2
+    )
+SELECT *
+FROM t

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-no-columns.js

@@ -0,0 +1,20 @@
+[
+    withRecursive(
+        t(
+            unionAll(
+                select(
+                    1,
+                ),
+                select(
+                    2,
+                ),
+            ),
+        ),
+        select(
+            '*',
+            from(
+                t,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive.js

@@ -0,0 +1,27 @@
+[
+    withRecursive(
+        numbers(
+            'value',
+            unionAll(
+                select(
+                    1,
+                ),
+                select(
+                    value + 1,
+                    from(
+                        numbers,
+                        where(
+                            value < 10,
+                        ),
+                    ),
+                ),
+            ),
+        ),
+        select(
+            value,
+            from(
+                numbers,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/with-recursive/with-recursive.js

@@ -0,0 +1,57 @@
+const isStringLiteral = ({type}) => type === 'StringLiteral';
+
+export const withRecursive = (path, {write, indent, traverse}) => {
+    const args = path.get('arguments');
+    const ctes = args.slice(0, -1);
+    const finalStatement = args.at(-1);
+    
+    write('WITH RECURSIVE');
+    write.newline();
+    
+    const last = ctes.length - 1;
+    
+    for (const [i, cte] of ctes.entries()) {
+        const {name} = cte.node.callee;
+        const cteArgs = cte.get('arguments');
+        const colArgs = cteArgs.filter(isStringLiteral);
+        
+        indent.inc();
+        write.indent();
+        indent.dec();
+        write(name);
+        
+        if (colArgs.length) {
+            write('(');
+            
+            for (const [j, col] of colArgs.entries()) {
+                if (j > 0)
+                    write(', ');
+                
+                write(col.node.value);
+            }
+            
+            write(')');
+        }
+        
+        write(' AS (');
+        write.newline();
+        indent.inc();
+        indent.inc();
+        write.indent();
+        traverse(cteArgs.at(-1));
+        indent.dec();
+        indent.dec();
+        write.newline();
+        indent.inc();
+        write.indent();
+        indent.dec();
+        write(')');
+        
+        if (i < last)
+            write(',');
+        
+        write.newline();
+    }
+    
+    traverse(finalStatement);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -25,6 +25,7 @@
     "#parser/clause/update": "./lib/parser/visitors/clause/update/update.js",
     "#parser/clause/delete": "./lib/parser/visitors/clause/delete/delete.js",
     "#parser/clause/with-named": "./lib/parser/visitors/clause/with-named/with-named.js",
+    "#parser/clause/union": "./lib/parser/visitors/clause/union/union.js",
     "#parser/clause/create-table": "./lib/parser/visitors/clause/create-table/create-table.js",
     "#parser/clause/create-sequence": "./lib/parser/visitors/clause/create-sequence/create-sequence.js",
     "#parser/clause/column-definition": "./lib/parser/visitors/clause/column-definition/column-definition.js",