happy-sql 2.1.1 → 2.2.1

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/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.1",
   "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"
   },

package/lib/parser/fixture/comment-fix.js

@@ -1,8 +0,0 @@
-[
-    select(
-        '*',
-        from(
-            users,
-        ),
-    ),
-];

package/lib/parser/fixture/comment.sql

@@ -1,2 +0,0 @@
--- hello world
-SELECT * FROM users;

package/lib/parser/fixture/section-multi-fix.js

@@ -1,24 +0,0 @@
-[
-    section(
-        '@fix', [
-            update(
-                Identifier,
-                set(
-                    name === 'isNaN',
-                ),
-                where(
-                    id === ':nan_id',
-                ),
-            ),
-            update(
-                BinaryExpression,
-                set(
-                    operator === '===',
-                ),
-                where(
-                    id === ':id',
-                ),
-            ),
-        ],
-    ),
-];

package/lib/parser/fixture/section-multi.sql

@@ -1,3 +0,0 @@
--- @fix
-UPDATE Identifier SET name = 'isNaN' WHERE id = :nan_id;
-UPDATE BinaryExpression SET operator = '===' WHERE id = :id;

package/lib/parser/fixture/select-fix.js

@@ -1,8 +0,0 @@
-[
-    select(
-        '*',
-        from(
-            users,
-        ),
-    ),
-];

package/lib/parser/fixture/select.sql

@@ -1 +0,0 @@
-SELECT * FROM users

package/lib/parser/fixture/with-named-fix.js

@@ -1,43 +0,0 @@
-[
-    withNamed(
-        call = insert(
-            into(
-                CallExpression,
-                parent_id,
-                values(
-                    ':parent_id',
-                ),
-            ),
-            returning(
-                id,
-            ),
-        ),
-        member = insert(
-            into(
-                MemberExpression,
-                parent_id,
-                select(
-                    id,
-                    from(
-                        call,
-                    ),
-                ),
-            ),
-            returning(
-                id,
-            ),
-        ),
-        insert(
-            into(
-                Identifier, [name, parent_id],
-                select(
-                    'x',
-                    id,
-                    from(
-                        member,
-                    ),
-                ),
-            ),
-        ),
-    ),
-];

package/lib/parser/fixture/with-named-insert-fix.js

@@ -1,44 +0,0 @@
-[
-    withNamed(
-        call = insert(
-            into(
-                CallExpression, [file, parent_id],
-                values(
-                    ':file',
-                    ':parent_id',
-                ),
-            ),
-            returning(
-                id,
-            ),
-        ),
-        member = insert(
-            into(
-                MemberExpression, [file, parent_id],
-                select(
-                    ':file',
-                    id,
-                    from(
-                        call,
-                    ),
-                ),
-            ),
-            returning(
-                id,
-            ),
-        ),
-        insert(
-            into(
-                Identifier, [file, name, parent_id],
-                select(
-                    ':file',
-                    'isNaN',
-                    id,
-                    from(
-                        member,
-                    ),
-                ),
-            ),
-        ),
-    ),
-];

package/lib/parser/fixture/with-named-insert.sql

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

package/lib/parser/fixture/with-named.sql

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

package/lib/parser/visitors/clause/count/fixture/count-fix.js

@@ -1,10 +0,0 @@
-[
-    select(
-        count(
-            '*',
-        ),
-        from(
-            users,
-        ),
-    ),
-];

package/lib/parser/visitors/clause/count/fixture/count-one-fix.js

@@ -1,10 +0,0 @@
-[
-    select(
-        count(
-            1,
-        ),
-        from(
-            users,
-        ),
-    ),
-];

package/lib/parser/visitors/clause/count/fixture/count-one.sql

@@ -1 +0,0 @@
-SELECT COUNT(1) FROM users

package/lib/parser/visitors/clause/count/fixture/count.sql

@@ -1 +0,0 @@
-SELECT COUNT(*) FROM users

package/lib/parser/visitors/clause/create-sequence/fixture/create-sequence-fix.js

@@ -1,5 +0,0 @@
-[
-    createSequence(
-        users_id_seq,
-    ),
-];

package/lib/parser/visitors/clause/create-sequence/fixture/create-sequence.sql

@@ -1,2 +0,0 @@
-CREATE SEQUENCE users_id_seq
-

package/lib/parser/visitors/clause/create-table/fixture/create-table-autoincrement-fix.js

@@ -1,12 +0,0 @@
-[
-    createTable(
-        t, [
-            column(
-                id,
-                INTEGER,
-                primaryKey(),
-                autoIncrement(),
-            ),
-        ],
-    ),
-];

package/lib/parser/visitors/clause/create-table/fixture/create-table-autoincrement.sql

@@ -1 +0,0 @@
-CREATE TABLE t (id INTEGER PRIMARY KEY AUTOINCREMENT)

package/lib/parser/visitors/clause/create-table/fixture/create-table-default-fix.js

@@ -1,11 +0,0 @@
-[
-    createTable(
-        t, [
-            column(
-                id,
-                INTEGER,
-                primaryKey(),
-            ),
-        ],
-    ),
-];

package/lib/parser/visitors/clause/create-table/fixture/create-table-default.sql

@@ -1 +0,0 @@
-CREATE TABLE t (id INTEGER DEFAULT 42 PRIMARY KEY)

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-always-fix.js

@@ -1,12 +0,0 @@
-[
-    createTable(
-        t, [
-            column(
-                id,
-                BIGINT,
-                identity(),
-                primaryKey(),
-            ),
-        ],
-    ),
-];

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-always.sql

@@ -1 +0,0 @@
-CREATE TABLE t (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY)

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-by-default-fix.js

@@ -1,12 +0,0 @@
-[
-    createTable(
-        t, [
-            column(
-                id,
-                BIGINT,
-                identityByDefault(),
-                primaryKey(),
-            ),
-        ],
-    ),
-];

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-by-default.sql

@@ -1 +0,0 @@
-CREATE TABLE t (id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY)

package/lib/parser/visitors/clause/create-table/fixture/create-table-nextval-fix.js

@@ -1,18 +0,0 @@
-[
-    createTable(
-        users, [
-            column(
-                id,
-                INTEGER,
-                nextval(
-                    users_id_seq,
-                ),
-                primaryKey(),
-            ),
-            column(
-                name,
-                TEXT,
-            ),
-        ],
-    ),
-];

package/lib/parser/visitors/clause/create-table/fixture/create-table-nextval.sql

@@ -1 +0,0 @@
-CREATE TABLE users (id INTEGER DEFAULT nextval('users_id_seq') PRIMARY KEY, name TEXT)

package/lib/parser/visitors/clause/create-table/fixture/create-table-not-null-fix.js

@@ -1,11 +0,0 @@
-[
-    createTable(
-        t, [
-            column(
-                id,
-                INTEGER,
-                primaryKey(),
-            ),
-        ],
-    ),
-];

package/lib/parser/visitors/clause/create-table/fixture/create-table-not-null.sql

@@ -1 +0,0 @@
-CREATE TABLE t (id INTEGER NOT NULL PRIMARY KEY)

package/lib/parser/visitors/clause/create-table/fixture/create-table-serial-fix.js

@@ -1,11 +0,0 @@
-[
-    createTable(
-        t, [
-            column(
-                id,
-                serial(),
-                primaryKey(),
-            ),
-        ],
-    ),
-];

package/lib/parser/visitors/clause/create-table/fixture/create-table-serial.sql

@@ -1 +0,0 @@
-CREATE TABLE t (id SERIAL PRIMARY KEY)

package/lib/parser/visitors/clause/delete/fixture/delete-fix.js

@@ -1,10 +0,0 @@
-[
-    deleteFrom(
-        from(
-            t,
-        ),
-        where(
-            id === ':id',
-        ),
-    ),
-];

package/lib/parser/visitors/clause/delete/fixture/delete-where-between-fix.js

@@ -1,14 +0,0 @@
-[
-    deleteFrom(
-        from(
-            t,
-        ),
-        where(
-            between(
-                id,
-                10,
-                20,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/delete/fixture/delete-where-between.sql

@@ -1 +0,0 @@
-DELETE FROM t WHERE id BETWEEN 10 AND 20

package/lib/parser/visitors/clause/delete/fixture/delete.sql

@@ -1 +0,0 @@
-DELETE FROM t WHERE id = :id

package/lib/parser/visitors/clause/from/fixture/from-fix.js

@@ -1,8 +0,0 @@
-[
-    select(
-        '*',
-        from(
-            users,
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/from-where-fix.js

@@ -1,12 +0,0 @@
-[
-    select(
-        u.id,
-        u.name,
-        from(
-            users as 'u',
-            where(
-                u.active === true,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/from-where.sql

@@ -1,3 +0,0 @@
-SELECT u.id, u.name
-FROM users AS u
-WHERE u.active = true;

package/lib/parser/visitors/clause/from/fixture/from.sql

@@ -1 +0,0 @@
-SELECT * FROM users

package/lib/parser/visitors/clause/from/fixture/generate-series-fix.js

@@ -1,12 +0,0 @@
-[
-    select(
-        '*',
-        from(
-            generateSeries(
-                1,
-                10,
-                2,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/generate-series.sql

@@ -1 +0,0 @@
-SELECT * FROM generate_series(1, 10, 2)

package/lib/parser/visitors/clause/from/fixture/group-by-fix.js

@@ -1,14 +0,0 @@
-[
-    select(
-        kind,
-        count(
-            '*',
-        ),
-        from(
-            VariableDeclaration,
-            groupBy(
-                kind,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/group-by-having-fix.js

@@ -1,22 +0,0 @@
-[
-    select(
-        kind,
-        count(
-            '*',
-        ),
-        from(
-            VariableDeclaration,
-            where(
-                kind === 'const',
-            ),
-            groupBy(
-                kind,
-            ),
-            having(
-                count(
-                    '*',
-                ) > 1,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/group-by-having.sql

@@ -1 +0,0 @@
-SELECT kind, COUNT(*) FROM VariableDeclaration WHERE kind = 'const' GROUP BY kind HAVING COUNT(*) > 1

package/lib/parser/visitors/clause/from/fixture/group-by-multi-fix.js

@@ -1,13 +0,0 @@
-[
-    select(
-        kind,
-        name,
-        from(
-            VariableDeclaration,
-            groupBy(
-                kind,
-                name,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/group-by-multi.sql

@@ -1 +0,0 @@
-SELECT kind, name FROM VariableDeclaration GROUP BY kind, name

package/lib/parser/visitors/clause/from/fixture/group-by-order-by-fix.js

@@ -1,17 +0,0 @@
-[
-    select(
-        dept,
-        count(
-            '*',
-        ),
-        from(
-            emp,
-            groupBy(
-                dept,
-            ),
-            orderBy(
-                dept,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/group-by-order-by.sql

@@ -1 +0,0 @@
-SELECT dept, COUNT(*) FROM emp GROUP BY dept ORDER BY dept

package/lib/parser/visitors/clause/from/fixture/group-by-sum-fix.js

@@ -1,14 +0,0 @@
-[
-    select(
-        dept,
-        sum(
-            salary,
-        ),
-        from(
-            emp,
-            groupBy(
-                dept,
-            ),
-        ),
-    ),
-];

package/lib/parser/visitors/clause/from/fixture/group-by-sum-having-fix.js

@@ -1,19 +0,0 @@
-[
-    select(
-        dept,
-        sum(
-            salary,
-        ),
-        from(
-            emp,
-            groupBy(
-                dept,
-            ),
-            having(
-                sum(
-                    salary,
-                ) > 1000,
-            ),
-        ),
-    ),
-];