happy-sql 2.1.1 → 2.2.0

package/lib/printer/visitors/call-expression/clauses/rollback-to/fixture/rollback-to.js

@@ -0,0 +1 @@
+[rollbackTo(sp1)];

package/lib/printer/visitors/call-expression/clauses/rollback-to/rollback-to.js

@@ -0,0 +1,4 @@
+export const rollbackTo = (path, {write, traverse}) => {
+    write('ROLLBACK TO SAVEPOINT ');
+    traverse(path.get('arguments')[0]);
+};

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

@@ -0,0 +1 @@
+(1, 2)

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

@@ -0,0 +1,6 @@
+[
+    row(
+        1,
+        2,
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/row/row.js

@@ -0,0 +1,14 @@
+export const row = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('(');
+    
+    for (let i = 0; i < args.length; i++) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(args[i]);
+    }
+    
+    write(')');
+};

package/lib/printer/visitors/call-expression/clauses/row-number/fixture/row-number-fix.sql

@@ -0,0 +1 @@
+SELECT ROW_NUMBER()

package/lib/printer/visitors/call-expression/clauses/row-number/fixture/row-number.js

@@ -0,0 +1 @@
+[select(rowNumber())];

package/lib/printer/visitors/call-expression/clauses/row-number/row-number.js

@@ -0,0 +1,3 @@
+export const rowNumber = (path, {write}) => {
+    write('ROW_NUMBER()');
+};

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

@@ -0,0 +1 @@
+SAVEPOINT sp1

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

@@ -0,0 +1 @@
+[savepoint(sp1)];

package/lib/printer/visitors/call-expression/clauses/savepoint/savepoint.js

@@ -0,0 +1,4 @@
+export const savepoint = (path, {write, traverse}) => {
+    write('SAVEPOINT ');
+    traverse(path.get('arguments')[0]);
+};

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

@@ -1,4 +1,6 @@
 import {types} from '@putout/babel';
+import {createTypeChecker} from '@putout/printer/type-checker';
+import {isJsonTuple, printJsonTuple} from '../json-op.js';
 
 const {isTSAsExpression} = types;
 
@@ -10,32 +12,50 @@ const printAsExpression = (path, {write, traverse}) => {
 const printItem = (path, printer) => {
     const {traverse} = printer;
     
+    if (isJsonTuple(path.node))
+        return printJsonTuple(path, printer);
+    
     if (isTSAsExpression(path.node))
         return printAsExpression(path, printer);
     
     traverse(path);
 };
 
+const isFrom = createTypeChecker([
+    ['-: -> !CallExpression'],
+    ['+: node.callee.name', '=', 'from'],
+]);
+
 export const select = (path, printer) => {
     const {write, traverse} = printer;
-    const args = path.get('arguments');
-    const lastArg = args.at(-1);
-    const hasFrom = lastArg?.node?.callee?.name === 'from';
-    const fromArg = hasFrom ? lastArg : null;
-    const cols = hasFrom ? args.slice(0, -1) : args;
+    const [cols, from] = parseCols(path);
     
     write('SELECT ');
     
-    for (let i = 0; i < cols.length; i++) {
-        if (i > 0)
+    const n = cols.length;
+    
+    for (const [i, col] of cols.entries()) {
+        if (i && i < n)
             write(', ');
         
-        printItem(cols[i], printer);
+        printItem(col, printer);
     }
     
-    if (fromArg) {
+    if (isFrom(from)) {
         write.breakline();
-        traverse(fromArg);
+        traverse(from);
     }
 };
 
+function parseCols(path) {
+    const args = path.get('arguments');
+    const from = args.at(-1);
+    
+    if (isFrom(from))
+        return [
+            args.slice(0, -1),
+            from,
+        ];
+    
+    return [args, null];
+}

package/lib/printer/visitors/call-expression/clauses/similar-to/fixture/similar-to-fix.sql

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE name SIMILAR TO '%foo%'

package/lib/printer/visitors/call-expression/clauses/similar-to/fixture/similar-to.js

@@ -0,0 +1 @@
+[select('*', from(t, where(similarTo(name, '%foo%'))))];

package/lib/printer/visitors/call-expression/clauses/similar-to/similar-to.js

@@ -0,0 +1,7 @@
+export const similarTo = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    traverse(args[0]);
+    write(' SIMILAR TO ');
+    traverse(args[1]);
+};

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

@@ -0,0 +1,3 @@
+SELECT *
+FROM (SELECT id
+FROM t) AS sub

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

@@ -0,0 +1,15 @@
+[
+    select(
+        '*',
+        from(
+            subquery(
+                select(
+                    id,
+                    from(
+                        t,
+                    ),
+                ),
+            ) as 'sub',
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/subquery/subquery.js

@@ -0,0 +1,5 @@
+export const subquery = (path, {write, traverse}) => {
+    write('(');
+    traverse(path.get('arguments')[0]);
+    write(')');
+};

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

@@ -0,0 +1,5 @@
+SELECT id
+FROM a
+UNION
+SELECT id
+FROM b

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

@@ -0,0 +1,16 @@
+[
+    union(
+        select(
+            id,
+            from(
+                a,
+            ),
+        ),
+        select(
+            id,
+            from(
+                b,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/union/union.js

@@ -0,0 +1,9 @@
+export const union = (path, {write, traverse}) => {
+    const [left, right] = path.get('arguments');
+    
+    traverse(left);
+    write.breakline();
+    write('UNION');
+    write.breakline();
+    traverse(right);
+};

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

@@ -0,0 +1 @@
+x INT UNIQUE

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

@@ -0,0 +1,3 @@
+[
+    column(x, INT, unique()),
+];

package/lib/printer/visitors/call-expression/clauses/unique/unique.js

@@ -0,0 +1,3 @@
+export const unique = (path, {write}) => {
+    write('UNIQUE');
+};

package/lib/printer/visitors/call-expression/clauses/update/fixture/update-returning-fix.sql

@@ -0,0 +1,4 @@
+UPDATE t
+SET x = 1
+WHERE id = 1
+RETURNING id

package/lib/printer/visitors/call-expression/clauses/update/fixture/update-returning.js

@@ -0,0 +1,14 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            id === 1,
+        ),
+        returning(
+            id,
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/update/update.js

@@ -2,15 +2,14 @@ export const update = (path, {write, traverse}) => {
     const args = path.get('arguments');
     const [table] = args;
     const [, set] = args;
-    const where = args[2];
     
     write('UPDATE ');
     traverse(table);
     write.newline();
     traverse(set);
     
-    if (where) {
+    for (const arg of args.slice(2)) {
         write.newline();
-        traverse(where);
+        traverse(arg);
     }
 };

package/lib/printer/visitors/call-expression/clauses/update-from/fixture/update-from-fix.sql

@@ -0,0 +1,4 @@
+UPDATE t
+SET x = 1
+FROM u
+WHERE t.id = u.id

package/lib/printer/visitors/call-expression/clauses/update-from/fixture/update-from.js

@@ -0,0 +1,14 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        updateFrom(
+            u,
+        ),
+        where(
+            t.id === u.id,
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/update-from/update-from.js

@@ -0,0 +1,4 @@
+export const updateFrom = (path, {write, traverse}) => {
+    write('FROM ');
+    traverse(path.get('arguments')[0]);
+};

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

@@ -0,0 +1 @@
+VACUUM

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

@@ -0,0 +1 @@
+[vacuum()];

package/lib/printer/visitors/call-expression/clauses/vacuum/vacuum.js

@@ -0,0 +1,3 @@
+export const vacuum = (path, {write}) => {
+    write('VACUUM');
+};

package/lib/printer/visitors/call-expression/clauses/values/fixture/values-multi-row-fix.sql

@@ -0,0 +1 @@
+INSERT INTO t (id) VALUES (1), (2), (3)

package/lib/printer/visitors/call-expression/clauses/values/fixture/values-multi-row.js

@@ -0,0 +1,19 @@
+[
+    insert(
+        into(
+            t,
+            id,
+            values(
+                row(
+                    1,
+                ),
+                row(
+                    2,
+                ),
+                row(
+                    3,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/values/values.js

@@ -1,12 +1,30 @@
-export const values = (path, {write, traverse}) => {
-    const args = path.get('arguments');
-    write('VALUES (');
+import {types} from '@putout/babel';
+
+const {isCallExpression} = types;
+
+const isRow = (arg) => isCallExpression(arg.node) && arg.node.callee.name === 'row';
+
+const printArgs = (args, {write, traverse}) => {
     for (let i = 0; i < args.length; i++) {
         if (i > 0)
             write(', ');
         
         traverse(args[i]);
     }
+};
+
+export const values = (path, printer) => {
+    const {write} = printer;
+    const args = path.get('arguments');
+    
+    if (args.length > 0 && isRow(args[0])) {
+        write('VALUES ');
+        printArgs(args, printer);
+        
+        return;
+    }
     
+    write('VALUES (');
+    printArgs(args, printer);
     write(')');
 };

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

@@ -1 +1,3 @@
-SELECT *, FROM users, WHERE id = :id
+SELECT *
+FROM users
+WHERE id = :id

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-gte-fix.sql

@@ -1 +1,3 @@
-SELECT *, FROM t, WHERE x >= 1
+SELECT *
+FROM t
+WHERE x >= 1

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-gte.js

@@ -1,3 +1,3 @@
 [
-    select('*', from(t), where(x >= 1)),
-];
+    select('*', from(t, where(x >= 1))),
+];

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-in-fix.sql

@@ -1 +1,3 @@
-SELECT *, FROM t, WHERE x IN (1, 2, 3)
+SELECT *
+FROM t
+WHERE x IN (1, 2, 3)

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-in.js

@@ -1,3 +1,3 @@
 [
-    select('*', from(t), where(inList(x, 1, 2, 3))),
-];
+    select('*', from(t, where(inList(x, 1, 2, 3)))),
+];

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-not-null-fix.sql

@@ -1 +1,3 @@
-SELECT *, FROM t, WHERE x IS NOT NULL
+SELECT *
+FROM t
+WHERE x IS NOT NULL

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-not-null.js

@@ -1,3 +1,3 @@
 [
-    select('*', from(t), where(isNotNull(x))),
-];
+    select('*', from(t, where(isNotNull(x)))),
+];

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-null-fix.sql

@@ -1 +1,3 @@
-SELECT *, FROM t, WHERE x IS NULL
+SELECT *
+FROM t
+WHERE x IS NULL

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-null.js

@@ -1,3 +1,3 @@
 [
-    select('*', from(t), where(isNull(x))),
-];
+    select('*', from(t, where(isNull(x)))),
+];

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-like-fix.sql

@@ -1 +1,3 @@
-SELECT *, FROM t, WHERE x LIKE :pattern
+SELECT *
+FROM t
+WHERE x LIKE :pattern

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-like.js

@@ -1,3 +1,3 @@
 [
-    select('*', from(t), where(like(x, ':pattern'))),
-];
+    select('*', from(t, where(like(x, ':pattern')))),
+];

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-ne-fix.sql

@@ -1 +1,3 @@
-SELECT *, FROM t, WHERE x != :y
+SELECT *
+FROM t
+WHERE x != :y

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-ne.js

@@ -1,3 +1,3 @@
 [
-    select('*', from(t), where(x !== ':y')),
-];
+    select('*', from(t, where(x !== ':y'))),
+];

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

@@ -1,3 +1,3 @@
 [
-    select('*', from(users), where(id === ':id')),
+    select('*', from(users, where(id === ':id'))),
 ];

package/lib/printer/visitors/call-expression/clauses/where/where.js

@@ -1,5 +1,15 @@
+import {isJsonTuple, printJsonTuple} from '../json-op.js';
+
 export const where = (path, {write, traverse}) => {
     const args = path.get('arguments');
+    
     write('WHERE ');
+    
+    if (isJsonTuple(args[0].node))
+        return printJsonTuple(args[0], {
+            write,
+            traverse,
+        });
+    
     traverse(args[0]);
 };

package/lib/printer/visitors/fixture/binary-expression-fix.sql

@@ -1 +1,3 @@
-SELECT *, FROM t, WHERE x % 2
+SELECT *
+FROM t
+WHERE x % 2

package/lib/printer/visitors/fixture/binary-expression.js

@@ -1,3 +1,3 @@
 [
-    select('*', from(t), where(x % 2)),
+    select('*', from(t, where(x % 2))),
 ];

package/lib/printer/visitors/fixture/logical-expression-fix.sql

@@ -0,0 +1 @@
+(a = 1 OR b = 2) AND c = 3

package/lib/printer/visitors/fixture/logical-expression.js

@@ -0,0 +1 @@
+[(a === 1 || b === 2) && c === 3];

package/lib/printer/visitors/index.js

@@ -1,7 +1,9 @@
 import {StringLiteral} from './string-literal.js';
+import {NullLiteral} from './null-literal.js';
+import {BooleanLiteral} from './boolean-literal.js';
+import {ArrayExpression} from './array-expression.js';
 import {ExpressionStatement} from './expression-statement.js';
 import {CallExpression} from './call-expression/call-expression.js';
-import {ArrayExpression} from './array-expression.js';
 import {BinaryExpression} from './binary-expression.js';
 import {LogicalExpression} from './logical-expression.js';
 import {MemberExpression} from './member-expression.js';
@@ -10,6 +12,8 @@ export const visitors = {
     ArrayExpression,
     CallExpression,
     StringLiteral,
+    NullLiteral,
+    BooleanLiteral,
     ExpressionStatement,
     BinaryExpression,
     LogicalExpression,

package/lib/printer/visitors/logical-expression.js

@@ -1,6 +1,39 @@
+const needsParensIn = (node, op) => op === '&&' && node.type === 'LogicalExpression' && node.operator === '||';
+
+const printNestedOr = (node, printer) => {
+    const {write, traverse} = printer;
+    write('(');
+    traverse(node.get('left'));
+    write(' OR ');
+    traverse(node.get('right'));
+    write(')');
+};
+
 export const LogicalExpression = (path, {write, traverse}) => {
-    const op = path.node.operator === '&&' ? 'AND' : 'OR';
-    traverse(path.get('left'));
-    write(`\n${op} `);
-    traverse(path.get('right'));
+    const {node} = path;
+    const op = node.operator === '&&' ? 'AND' : 'OR';
+    const left = path.get('left');
+    const right = path.get('right');
+    const hasNestedParen = needsParensIn(left.node, node.operator) || needsParensIn(right.node, node.operator);
+    const separator = hasNestedParen ? ` ${op} ` : `\n${op} `;
+    
+    if (needsParensIn(left.node, node.operator))
+        printNestedOr(left, {
+            write,
+            traverse,
+        });
+    else
+        traverse(left);
+    
+    write(separator);
+    
+    if (needsParensIn(right.node, node.operator)) {
+        printNestedOr(right, {
+            write,
+            traverse,
+        });
+        return;
+    }
+    
+    traverse(right);
 };

package/lib/printer/visitors/null-literal.js

@@ -0,0 +1,3 @@
+export const NullLiteral = (path, {write}) => {
+    write('NULL');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -14,6 +14,7 @@
     "#parser": "./lib/parser/parser.js",
     "#parser/clause/operand": "./lib/parser/visitors/clause/operand.js",
     "#parser/clause/set": "./lib/parser/visitors/clause/set.js",
+    "#parser/clause/binary": "./lib/parser/visitors/clause/binary.js",
     "#parser/clause/find": "./lib/parser/visitors/clause/find-clause.js",
     "#parser/test": "./test/create-parser-test.js",
     "#parser/clause": "./lib/parser/visitors/clause/index.js",
@@ -22,13 +23,22 @@
     "#parser/clause/from": "./lib/parser/visitors/clause/from/from.js",
     "#parser/clause/where": "./lib/parser/visitors/clause/where/where.js",
     "#parser/clause/insert": "./lib/parser/visitors/clause/insert/insert.js",
+    "#parser/clause/returning": "./lib/parser/visitors/clause/returning.js",
     "#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-index": "./lib/parser/visitors/clause/create-index/create-index.js",
     "#parser/clause/create-sequence": "./lib/parser/visitors/clause/create-sequence/create-sequence.js",
+    "#parser/clause/alter-table": "./lib/parser/visitors/clause/alter-table/alter-table.js",
+    "#parser/clause/drop-table": "./lib/parser/visitors/clause/drop-table/drop-table.js",
+    "#parser/clause/transaction": "./lib/parser/visitors/clause/transaction/transaction.js",
+    "#parser/clause/drop-index": "./lib/parser/visitors/clause/drop-index/drop-index.js",
+    "#parser/clause/pragma": "./lib/parser/visitors/clause/pragma/pragma.js",
+    "#parser/clause/attach": "./lib/parser/visitors/clause/attach/attach.js",
     "#parser/clause/column-definition": "./lib/parser/visitors/clause/column-definition/column-definition.js",
+    "#parser/clause/case-when": "./lib/parser/visitors/clause/case-when/case-when.js",
     "#printer": "./lib/printer/printer.js",
     "#printer/test": "./test/create-printer-test.js"
   },