happy-sql 2.1.1 → 2.2.0

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

@@ -1,4 +1,10 @@
+import {fullOuterJoin} from './full-outer-join/full-outer-join.js';
 import {join} from './join/join.js';
+import {naturalJoin} from './natural-join/natural-join.js';
+import {notLike} from './not-like/not-like.js';
+import {ilike} from './ilike/ilike.js';
+import {similarTo} from './similar-to/similar-to.js';
+import {isDistinctFrom} from './is-distinct-from/is-distinct-from.js';
 import {on} from './on/on.js';
 import {select} from './select/select.js';
 import {from} from './from/from.js';
@@ -8,6 +14,7 @@ import {into} from './into/into.js';
 import {values} from './values/values.js';
 import {onConflict} from './on-conflict/on-conflict.js';
 import {update} from './update/update.js';
+import {updateFrom} from './update-from/update-from.js';
 import {set} from './set/set.js';
 import {deleteFrom} from './delete/delete.js';
 import {section} from './section/section.js';
@@ -16,6 +23,7 @@ import {returning} from './returning/returning.js';
 import {withNamed} from './with-named/with-named.js';
 import {withRecursive} from './with-recursive/with-recursive.js';
 import {unionAll} from './union-all/union-all.js';
+import {union} from './union/union.js';
 import {groupBy} from './group-by/group-by.js';
 import {having} from './having/having.js';
 import {sum} from './sum/sum.js';
@@ -28,8 +36,55 @@ import {limit} from './limit/limit.js';
 import {distinct} from './distinct/distinct.js';
 import {notInList} from './not-in-list/not-in-list.js';
 import {between} from './between/between.js';
+import {notBetween} from './not-between/not-between.js';
+import {subquery} from './subquery/subquery.js';
+import {inQuery} from './in-query/in-query.js';
+import {exists} from './exists/exists.js';
+import {notExists} from './not-exists/not-exists.js';
+import {cast} from './cast/cast.js';
+import {pgCast} from './pg-cast/pg-cast.js';
+import {ANY} from './any/any.js';
+import {ALL} from './all/all.js';
+import {lateralJoin} from './lateral-join/lateral-join.js';
+import {lateralSubquery} from './lateral-subquery/lateral-subquery.js';
+import {createIndex} from './create-index/create-index.js';
+import {createUniqueIndex} from './create-index/create-unique-index.js';
+import {vacuum} from './vacuum/vacuum.js';
+import {row} from './row/row.js';
+import {notNull} from './not-null/not-null.js';
+import {default_} from './default/default.js';
+import {unique} from './unique/unique.js';
+import {check} from './check/check.js';
+import {references} from './references/references.js';
+import {createTableIfNotExists} from './create-table-if-not-exists/create-table-if-not-exists.js';
+import {caseWhen} from './case-when/case-when.js';
+import {leftJoin} from './left-join/left-join.js';
+import {rightJoin} from './right-join/right-join.js';
+import {innerJoin} from './inner-join/inner-join.js';
+import {leftOuterJoin} from './left-outer-join/left-outer-join.js';
+import {crossJoin} from './cross-join/cross-join.js';
 import {createTable} from './create-table/create-table.js';
+import {alterTable} from './alter-table/alter-table.js';
+import {addColumn} from './add-column/add-column.js';
+import {dropColumn} from './drop-column/drop-column.js';
+import {renameColumn} from './rename-column/rename-column.js';
+import {alterColumnType} from './alter-column-type/alter-column-type.js';
+import {begin} from './begin/begin.js';
+import {commit} from './commit/commit.js';
+import {rollback} from './rollback/rollback.js';
+import {rollbackTo} from './rollback-to/rollback-to.js';
+import {savepoint} from './savepoint/savepoint.js';
 import {createSequence} from './create-sequence/create-sequence.js';
+import {extract} from './extract/extract.js';
+import {concat} from './concat/concat.js';
+import {array} from './array/array.js';
+import {over} from './over/over.js';
+import {partitionBy} from './partition-by/partition-by.js';
+import {rowNumber} from './row-number/row-number.js';
+import {dropTable} from './drop-table/drop-table.js';
+import {dropIndex} from './drop-index/drop-index.js';
+import {pragma} from './pragma/pragma.js';
+import {attach} from './attach/attach.js';
 import {column} from './column/column.js';
 import {autoIncrement} from './auto-increment/auto-increment.js';
 import {serial} from './serial/serial.js';
@@ -39,6 +94,8 @@ import {lastval} from './lastval/lastval.js';
 import {nextval} from './nextval/nextval.js';
 import {like} from './like/like.js';
 import {isNull, isNotNull} from './is-null/is-null.js';
+import {orReplace} from './or-replace/or-replace.js';
+import {orIgnore} from './or-ignore/or-ignore.js';
 import {inList} from './in-list/in-list.js';
 import {
     identity,
@@ -54,9 +111,27 @@ export const clauses = {
     where,
     insert,
     into,
+    orReplace,
+    orIgnore,
+    pgCast,
+    ANY,
+    ALL,
+    lateralJoin,
+    lateralSubquery,
+    createIndex,
+    createUniqueIndex,
+    vacuum,
+    row,
+    notNull,
+    default_,
+    unique,
+    check,
+    references,
+    createTableIfNotExists,
     values,
     onConflict,
     update,
+    updateFrom,
     set,
     deleteFrom,
     section,
@@ -64,6 +139,7 @@ export const clauses = {
     withNamed,
     withRecursive,
     unionAll,
+    union,
     groupBy,
     having,
     sum,
@@ -75,9 +151,43 @@ export const clauses = {
     limit,
     distinct,
     notInList,
+    notBetween,
     between,
+    subquery,
+    inQuery,
+    exists,
+    notExists,
+    cast,
+    caseWhen,
+    leftJoin,
+    rightJoin,
+    innerJoin,
+    leftOuterJoin,
+    fullOuterJoin,
+    naturalJoin,
+    crossJoin,
     createTable,
+    alterTable,
+    addColumn,
+    dropColumn,
+    renameColumn,
+    alterColumnType,
+    begin,
+    commit,
+    rollback,
+    rollbackTo,
+    savepoint,
     createSequence,
+    extract,
+    concat,
+    array,
+    over,
+    partitionBy,
+    rowNumber,
+    dropTable,
+    dropIndex,
+    pragma,
+    attach,
     column,
     autoIncrement,
     serial,
@@ -86,6 +196,10 @@ export const clauses = {
     lastval,
     nextval,
     like,
+    notLike,
+    ilike,
+    similarTo,
+    isDistinctFrom,
     isNull,
     isNotNull,
     inList,

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

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

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

@@ -0,0 +1 @@
+COMMIT

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

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

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

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

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

@@ -0,0 +1,2 @@
+SELECT a || b
+FROM t

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

@@ -0,0 +1 @@
+[select(concat(a, b), from(t))];

package/lib/printer/visitors/call-expression/clauses/create-index/create-index.js

@@ -0,0 +1,20 @@
+export const createIndex = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('CREATE INDEX ');
+    traverse(args[0]);
+    write(' ON ');
+    traverse(args[1]);
+    write(' (');
+    
+    for (const [i, arg] of args
+        .slice(2)
+        .entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+    
+    write(')');
+};

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

@@ -0,0 +1,20 @@
+export const createUniqueIndex = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('CREATE UNIQUE INDEX ');
+    traverse(args[0]);
+    write(' ON ');
+    traverse(args[1]);
+    write(' (');
+    
+    for (const [i, arg] of args
+        .slice(2)
+        .entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+    
+    write(')');
+};

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

@@ -0,0 +1 @@
+CREATE INDEX idx ON t (name)

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

@@ -0,0 +1,7 @@
+[
+    createIndex(
+        idx,
+        t,
+        name,
+    ),
+];

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

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX idx ON t (name)

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

@@ -0,0 +1,7 @@
+[
+    createUniqueIndex(
+        idx,
+        t,
+        name,
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/create-table/create-table.js

@@ -1,7 +1,6 @@
-export const createTable = (path, {write, traverse}) => {
+export const printTableBody = (path, {write, traverse}) => {
     const [name, columns] = path.get('arguments');
     
-    write('CREATE TABLE ');
     traverse(name);
     write.space();
     write('(');
@@ -20,3 +19,8 @@ export const createTable = (path, {write, traverse}) => {
     
     write(')');
 };
+
+export const createTable = (path, printer) => {
+    printer.write('CREATE TABLE ');
+    printTableBody(path, printer);
+};

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-check-fix.sql

@@ -0,0 +1,2 @@
+CREATE TABLE t (
+x INT CHECK (x > 0))

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-check.js

@@ -0,0 +1,13 @@
+[
+    createTable(
+        t, [
+            column(
+                x,
+                INT,
+                check(
+                    x > 0,
+                ),
+            ),
+        ],
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-default-int-fix.sql

@@ -0,0 +1,2 @@
+CREATE TABLE t (
+id INT DEFAULT 0)

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-default-int.js

@@ -0,0 +1,13 @@
+[
+    createTable(
+        t, [
+            column(
+                id,
+                INT,
+                default_(
+                    0,
+                ),
+            ),
+        ],
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-not-null-fix.sql

@@ -0,0 +1,2 @@
+CREATE TABLE t (
+id INT NOT NULL)

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-not-null.js

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

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-references-fix.sql

@@ -0,0 +1,2 @@
+CREATE TABLE orders (
+user_id INT REFERENCES users(id))

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/create-table-references.js

@@ -0,0 +1,14 @@
+[
+    createTable(
+        orders, [
+            column(
+                user_id,
+                INT,
+                references(
+                    users,
+                    id,
+                ),
+            ),
+        ],
+    ),
+];

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

@@ -0,0 +1,2 @@
+CREATE TABLE t (
+x INT UNIQUE)

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

@@ -0,0 +1,11 @@
+[
+    createTable(
+        t, [
+            column(
+                x,
+                INT,
+                unique(),
+            ),
+        ],
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/create-table-if-not-exists/create-table-if-not-exists.js

@@ -0,0 +1,6 @@
+import {printTableBody} from '../create-table/create-table.js';
+
+export const createTableIfNotExists = (path, printer) => {
+    printer.write('CREATE TABLE IF NOT EXISTS ');
+    printTableBody(path, printer);
+};

package/lib/printer/visitors/call-expression/clauses/create-table-if-not-exists/fixture/create-table-if-not-exists-fix.sql

@@ -0,0 +1,2 @@
+CREATE TABLE IF NOT EXISTS t (
+id INT)

package/lib/printer/visitors/call-expression/clauses/create-table-if-not-exists/fixture/create-table-if-not-exists.js

@@ -0,0 +1,10 @@
+[
+    createTableIfNotExists(
+        t, [
+            column(
+                id,
+                INT,
+            ),
+        ],
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/cross-join/cross-join.js

@@ -0,0 +1,9 @@
+import {printTable} from '../join/join.js';
+
+export const crossJoin = (path, printer) => {
+    const {write} = printer;
+    
+    write.breakline();
+    write('CROSS JOIN ');
+    printTable(path.get('arguments')[0], printer);
+};

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

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+CROSS JOIN u

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

@@ -0,0 +1 @@
+[select("*", from(t, crossJoin(u)))];

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

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

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

@@ -0,0 +1 @@
+id INT DEFAULT 0

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

@@ -0,0 +1,3 @@
+[
+    column(id, INT, default_(0)),
+];

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

@@ -1,13 +1,11 @@
 export const deleteFrom = (path, {write, traverse}) => {
-    const args = path.get('arguments');
-    const [fromArg] = args;
-    const [, whereArg] = args;
+    const [fromArg, ...rest] = path.get('arguments');
     
     write('DELETE ');
     traverse(fromArg);
     
-    if (whereArg) {
+    for (const arg of rest) {
         write.newline();
-        traverse(whereArg);
+        traverse(arg);
     }
 };

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

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

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

@@ -0,0 +1,13 @@
+[
+    deleteFrom(
+        from(
+            t,
+        ),
+        where(
+            id === 1,
+        ),
+        returning(
+            id,
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/drop-column/drop-column.js

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

package/lib/printer/visitors/call-expression/clauses/drop-index/drop-index.js

@@ -0,0 +1,12 @@
+export const dropIndex = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('DROP INDEX ');
+    
+    for (const [i, arg] of args.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+};

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

@@ -0,0 +1 @@
+DROP INDEX idx

package/lib/printer/visitors/call-expression/clauses/drop-index/fixture/drop-index-multi-fix.sql

@@ -0,0 +1 @@
+DROP INDEX idx1, idx2

package/lib/printer/visitors/call-expression/clauses/drop-index/fixture/drop-index-multi.js

@@ -0,0 +1 @@
+[dropIndex(idx1, idx2)];

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

@@ -0,0 +1 @@
+[dropIndex(idx)];

package/lib/printer/visitors/call-expression/clauses/drop-table/drop-table.js

@@ -0,0 +1,25 @@
+import {types} from '@putout/babel';
+
+const {isCallExpression} = types;
+
+const isIfExists = (arg) => isCallExpression(arg.node) && arg.node.callee.name === 'ifExists';
+
+export const dropTable = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('DROP TABLE ');
+    
+    let tableArgs = args;
+    
+    if (args.length > 0 && isIfExists(args[0])) {
+        write('IF EXISTS ');
+        tableArgs = args.slice(1);
+    }
+    
+    for (const [i, arg] of tableArgs.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+};

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

@@ -0,0 +1 @@
+DROP TABLE users

package/lib/printer/visitors/call-expression/clauses/drop-table/fixture/drop-table-if-exists-fix.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS users

package/lib/printer/visitors/call-expression/clauses/drop-table/fixture/drop-table-if-exists.js

@@ -0,0 +1 @@
+[dropTable(ifExists(), users)];

package/lib/printer/visitors/call-expression/clauses/drop-table/fixture/drop-table-multi-fix.sql

@@ -0,0 +1 @@
+DROP TABLE a, b

package/lib/printer/visitors/call-expression/clauses/drop-table/fixture/drop-table-multi.js

@@ -0,0 +1 @@
+[dropTable(a, b)];

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

@@ -0,0 +1 @@
+[dropTable(users)];

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

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

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

@@ -0,0 +1,5 @@
+SELECT *
+FROM t
+WHERE EXISTS (SELECT 1
+FROM u
+WHERE u.id = t.id)

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

@@ -0,0 +1,21 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                exists(
+                    select(
+                        1,
+                        from(
+                            u,
+                            where(
+                                u.id === t.id,
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1,9 @@
+export const extract = (path, {write, traverse}) => {
+    const [unit, col] = path.get('arguments');
+    
+    write('EXTRACT(');
+    traverse(unit);
+    write(' FROM ');
+    traverse(col);
+    write(')');
+};

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

@@ -0,0 +1,2 @@
+SELECT EXTRACT(YEAR FROM created_at)
+FROM t

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

@@ -0,0 +1 @@
+[select(extract(YEAR, created_at), from(t))];

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

@@ -21,10 +21,20 @@ const CLAUSE_NAMES = [
 const TABLE_ARG_NAMES = [
     ...CLAUSE_NAMES,
     'join',
+    'leftJoin',
+    'rightJoin',
+    'innerJoin',
+    'leftOuterJoin',
+    'fullOuterJoin',
+    'naturalJoin',
+    'crossJoin',
     'on',
+    'subquery',
+    'lateralJoin',
+    'lateralSubquery',
 ];
 
-const isClause = ({node}) => node.type === 'CallExpression' && CLAUSE_NAMES.includes(node.callee?.name);
+const isClause = ({node}) => isCallExpression(node) && CLAUSE_NAMES.includes(node.callee.name);
 
 const CAMEL_RE = /([A-Z])/g;
 const toSnake = (a) => a.replace(CAMEL_RE, (_, c) => `_${c.toLowerCase()}`);
@@ -83,4 +93,3 @@ export const from = (path, {write, traverse}) => {
         traverse(clause);
     }
 };
-

package/lib/printer/visitors/call-expression/clauses/full-outer-join/fixture/full-outer-join-fix.sql

@@ -0,0 +1,3 @@
+SELECT *
+FROM a
+FULL OUTER JOIN b ON a.id = b.id

package/lib/printer/visitors/call-expression/clauses/full-outer-join/fixture/full-outer-join.js

@@ -0,0 +1 @@
+[select('*', from(a, fullOuterJoin(b, on(a.id === b.id))))];