happy-sql 2.1.1 → 2.2.1

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/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-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/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/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/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/full-outer-join.js

@@ -0,0 +1,9 @@
+import {printJoinBody} from '../join/join.js';
+
+export const fullOuterJoin = (path, printer) => {
+    const {write} = printer;
+    
+    write.breakline();
+    write('FULL OUTER JOIN ');
+    printJoinBody(path, printer);
+};

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

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

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

@@ -0,0 +1,8 @@
+export const inQuery = (path, {write, traverse}) => {
+    const [col, stmt] = path.get('arguments');
+    
+    traverse(col);
+    write(' IN (');
+    traverse(stmt);
+    write(')');
+};

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

@@ -0,0 +1,8 @@
+import {printJoinBody} from '../join/join.js';
+
+export const innerJoin = (path, printer) => {
+    const {write} = printer;
+    write.breakline();
+    write('INNER JOIN ');
+    printJoinBody(path, printer);
+};

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

@@ -1,11 +1,24 @@
+const isOrAction = (arg) => {
+    const {name} = arg.node.callee;
+    
+    return name === 'orReplace' || name === 'orIgnore';
+};
+
 export const insert = (path, {write, traverse}) => {
     const args = path.get('arguments');
-    const [intoArg] = args;
-    const rest = args.slice(1);
+    const [first] = args;
+    const rest = isOrAction(first) ? args.slice(1) : args;
+    
+    write('INSERT ');
+    
+    if (isOrAction(first)) {
+        traverse(first);
+        write.breakline();
+    }
     
-    traverse(intoArg);
+    traverse(rest[0]);
     
-    for (const arg of rest) {
+    for (const arg of rest.slice(1)) {
         write.breakline();
         traverse(arg);
     }

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

@@ -4,7 +4,7 @@ export const into = (path, {write, traverse}) => {
     const [, columns] = args;
     const values = args[2];
     
-    write('INSERT INTO ');
+    write('INTO ');
     traverse(table);
     write(' (');
     

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

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

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

@@ -7,7 +7,7 @@ const printAsExpression = (path, {write, traverse}) => {
     write(` AS ${path.node.typeAnnotation.literal.value}`);
 };
 
-const printTable = (path, printer) => {
+export const printTable = (path, printer) => {
     const {traverse} = printer;
     
     if (isTSAsExpression(path.node))
@@ -16,15 +16,18 @@ const printTable = (path, printer) => {
     traverse(path);
 };
 
-export const join = (path, {write, traverse}) => {
+export const printJoinBody = (path, printer) => {
+    const {write, traverse} = printer;
     const [table, onClause] = path.get('arguments');
     
-    write.breakline();
-    write('JOIN ');
-    printTable(table, {
-        write,
-        traverse,
-    });
+    printTable(table, printer);
     write.space();
     traverse(onClause);
 };
+
+export const join = (path, printer) => {
+    const {write} = printer;
+    write.breakline();
+    write('JOIN ');
+    printJoinBody(path, printer);
+};

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

@@ -0,0 +1,21 @@
+const JSON_OPS = new Set([
+    '->',
+    '->>',
+    '#>',
+    '#>>',
+    '?',
+    '?|',
+    '?&',
+    '@>',
+    '<@',
+]);
+
+export const isJsonTuple = (node) => node.type === 'ArrayExpression' && node.elements.length === 3 && node.elements[1].type === 'StringLiteral' && JSON_OPS.has(node.elements[1].value);
+
+export const printJsonTuple = (path, {write, traverse}) => {
+    const elems = path.get('elements');
+    
+    traverse(elems[0]);
+    write(` ${elems[1].node.value} `);
+    traverse(elems[2]);
+};

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

@@ -0,0 +1,19 @@
+import {types} from '@putout/babel';
+
+const {isTSAsExpression} = types;
+
+export const lateralJoin = (path, {write, traverse}) => {
+    write(', ');
+    
+    const [arg] = path.get('arguments');
+    const {node} = arg;
+    
+    if (isTSAsExpression(node)) {
+        traverse(arg.get('expression'));
+        write(` AS ${node.typeAnnotation.literal.value}`);
+        
+        return;
+    }
+    
+    traverse(arg);
+};

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

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

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

@@ -0,0 +1,8 @@
+import {printJoinBody} from '../join/join.js';
+
+export const leftJoin = (path, printer) => {
+    const {write} = printer;
+    write.breakline();
+    write('LEFT JOIN ');
+    printJoinBody(path, printer);
+};

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

@@ -0,0 +1,8 @@
+import {printJoinBody} from '../join/join.js';
+
+export const leftOuterJoin = (path, printer) => {
+    const {write} = printer;
+    write.breakline();
+    write('LEFT OUTER JOIN ');
+    printJoinBody(path, printer);
+};

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

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

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

@@ -0,0 +1,9 @@
+export const notBetween = (path, {write, traverse}) => {
+    const [col, lo, hi] = path.get('arguments');
+    
+    traverse(col);
+    write(' NOT BETWEEN ');
+    traverse(lo);
+    write(' AND ');
+    traverse(hi);
+};

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

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+export const orIgnore = (path, {write}) => {
+    write('OR IGNORE');
+};

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

@@ -0,0 +1,3 @@
+export const orReplace = (path, {write}) => {
+    write('OR REPLACE');
+};

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

@@ -0,0 +1,17 @@
+export const over = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    const [func] = args;
+    const clauses = args.slice(1);
+    
+    traverse(func);
+    write(' OVER (');
+    
+    for (const [i, clause] of clauses.entries()) {
+        if (i > 0)
+            write(' ');
+        
+        traverse(clause);
+    }
+    
+    write(')');
+};

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

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

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

@@ -0,0 +1,7 @@
+export const pgCast = (path, {write, traverse}) => {
+    const [value, type] = path.get('arguments');
+    
+    traverse(value);
+    write('::');
+    traverse(type);
+};

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

@@ -0,0 +1,9 @@
+export const pragma = (path, {write, traverse}) => {
+    const [name, arg] = path.get('arguments');
+    
+    write('PRAGMA ');
+    traverse(name);
+    write('(');
+    traverse(arg);
+    write(')');
+};

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

@@ -0,0 +1,17 @@
+export const references = (path, {write, traverse}) => {
+    write('REFERENCES ');
+    const [first, ...other] = path.get('arguments');
+    
+    traverse(first);
+    
+    write('(');
+    
+    for (const [i, arg] of other.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+    
+    write(')');
+};

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

@@ -0,0 +1,8 @@
+export const renameColumn = (path, {write, traverse}) => {
+    const [from, to] = path.get('arguments');
+    
+    write('RENAME COLUMN ');
+    traverse(from);
+    write(' TO ');
+    traverse(to);
+};

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

@@ -0,0 +1,8 @@
+import {printJoinBody} from '../join/join.js';
+
+export const rightJoin = (path, printer) => {
+    const {write} = printer;
+    write.breakline();
+    write('RIGHT JOIN ');
+    printJoinBody(path, printer);
+};

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

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

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/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/row-number.js

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

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/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/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/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/unique.js

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

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/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/vacuum.js

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

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(')');
 };