happy-sql 2.3.0 → 2.4.0

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

@@ -0,0 +1,32 @@
+const ACTION_PRINT = {
+    SET_NULL: 'SET NULL',
+    SET_DEFAULT: 'SET DEFAULT',
+    NO_ACTION: 'NO ACTION',
+};
+
+export const onDelete = (path, {write, traverse}) => {
+    write('ON DELETE ');
+    printAction(path, {
+        write,
+        traverse,
+    });
+};
+
+export const onUpdate = (path, {write, traverse}) => {
+    write('ON UPDATE ');
+    printAction(path, {
+        write,
+        traverse,
+    });
+};
+
+const printAction = (path, printer) => {
+    const {write, traverse} = printer;
+    const arg = path.get('arguments.0');
+    const {name} = arg.node;
+    
+    if (ACTION_PRINT[name])
+        return write(ACTION_PRINT[name]);
+    
+    traverse(arg);
+};

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

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

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

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

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

@@ -1,9 +1,21 @@
+import {types} from '@putout/babel';
+
+const {isIdentifier} = types;
+
 export const over = (path, {write, traverse}) => {
     const args = path.get('arguments');
     const [func] = args;
     const clauses = args.slice(1);
     
     traverse(func);
+    
+    if (clauses.length && isIdentifier(clauses[0].node)) {
+        write(' OVER ');
+        traverse(clauses[0]);
+        
+        return;
+    }
+    
     write(' OVER (');
     
     for (const [i, clause] of clauses.entries()) {

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

@@ -1,9 +1,18 @@
 export const pragma = (path, {write, traverse}) => {
-    const [name, arg] = path.get('arguments');
+    const args = path.get('arguments');
     
     write('PRAGMA ');
-    traverse(name);
-    write('(');
-    traverse(arg);
-    write(')');
+    
+    // func-call form: PRAGMA table_info(users)
+    if (args.length === 2) {
+        traverse(args[0]);
+        write('(');
+        traverse(args[1]);
+        write(')');
+        
+        return;
+    }
+    
+    // no-args, qualified or assignment form
+    traverse(args[0]);
 };

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

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

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

@@ -1,16 +1,26 @@
 export const references = (path, {write, traverse}) => {
-    write('REFERENCES ');
     const [first, ...other] = path.get('arguments');
     
+    write('REFERENCES ');
     traverse(first);
-    
     write('(');
     
-    for (const [i, arg] of other.entries()) {
-        if (i > 0)
+    let wroteCol = false;
+    
+    for (const arg of other) {
+        const name = arg.node?.callee?.name;
+        
+        if (name === 'onDelete' || name === 'onUpdate') {
+            write(' ');
+            traverse(arg);
+            continue;
+        }
+        
+        if (wroteCol)
             write(', ');
         
         traverse(arg);
+        wroteCol = true;
     }
     
     write(')');

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

@@ -0,0 +1,10 @@
+export const reindex = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('REINDEX');
+    
+    if (args.length) {
+        write.space();
+        traverse(args[0]);
+    }
+};

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+export const enableRowLevelSecurity = (path, {write}) => {
+    write('ENABLE ROW LEVEL SECURITY');
+};
+
+export const disableRowLevelSecurity = (path, {write}) => {
+    write('DISABLE ROW LEVEL SECURITY');
+};

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

@@ -2,7 +2,10 @@ import {types} from '@putout/babel';
 import {createTypeChecker} from '@putout/printer/type-checker';
 import {isJsonTuple, printJsonTuple} from '../json-op.js';
 
-const {isTSAsExpression} = types;
+const {
+    isTSAsExpression,
+    isCallExpression,
+} = types;
 
 const printAsExpression = (path, {write, traverse}) => {
     traverse(path.get('expression'));
@@ -26,24 +29,41 @@ const isFrom = createTypeChecker([
     ['+: node.callee.name', '=', 'from'],
 ]);
 
+const isClauseName = (path) => isCallExpression(path.node) && [
+    'limitAll',
+    'offset',
+    'fetchFirst',
+    'forUpdate',
+].includes(path.node.callee.name);
+
+const isDistinctOn = (path) => isCallExpression(path.node) && path.node.callee.name === 'distinctOn';
+
 export const select = (path, printer) => {
     const {write, traverse} = printer;
-    const [cols, from] = parseCols(path);
+    const [cols, trailing] = parseCols(path);
     
     write('SELECT ');
     
+    let first = 0;
+    
+    if (cols.length && isDistinctOn(cols[0])) {
+        traverse(cols[0]);
+        write(' ');
+        first = 1;
+    }
+    
     const n = cols.length;
     
-    for (const [i, col] of cols.entries()) {
-        if (i && i < n)
+    for (let i = first; i < n; i++) {
+        if (i > first)
             write(', ');
         
-        printItem(col, printer);
+        printItem(cols[i], printer);
     }
     
-    if (isFrom(from)) {
+    for (const clause of trailing) {
         write.breakline();
-        traverse(from);
+        traverse(clause);
     }
 };
 
@@ -54,8 +74,16 @@ function parseCols(path) {
     if (isFrom(from))
         return [
             args.slice(0, -1),
-            from,
+            [from],
         ];
     
-    return [args, null];
+    let i = args.length;
+    
+    while (i && isClauseName(args[i - 1]))
+        --i;
+    
+    return [
+        args.slice(0, i),
+        args.slice(i),
+    ];
 }

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

@@ -0,0 +1,14 @@
+export const setParam = (path, {write, traverse}) => {
+    const [name, ...values] = path.get('arguments');
+    
+    write('SET ');
+    traverse(name);
+    write(' TO ');
+    
+    for (const [i, value] of values.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(value);
+    }
+};

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

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

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

@@ -0,0 +1,13 @@
+export const tablePrimaryKey = (path, {write, traverse}) => {
+    write('PRIMARY KEY (');
+    const args = path.get('arguments');
+    
+    for (const [i, arg] of args.entries()) {
+        if (i)
+            write(', ');
+        
+        traverse(arg);
+    }
+    
+    write(')');
+};

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

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

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

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

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

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

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

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

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

@@ -1,14 +1,35 @@
+import {types} from '@putout/babel';
+
+const {isCallExpression} = types;
+
+const OR_ACTION_NAMES = [
+    'orReplace',
+    'orIgnore',
+    'orAbort',
+    'orFail',
+];
+
+const isOrAction = (arg) => isCallExpression(arg.node) && OR_ACTION_NAMES.includes(arg.node.callee.name);
+
 export const update = (path, {write, traverse}) => {
     const args = path.get('arguments');
-    const [table] = args;
-    const [, set] = args;
+    let rest = args;
     
     write('UPDATE ');
+    
+    if (isOrAction(args[0])) {
+        traverse(args[0]);
+        write(' ');
+        rest = args.slice(1);
+    }
+    
+    const [table, set] = rest;
+    
     traverse(table);
     write.newline();
     traverse(set);
     
-    for (const arg of args.slice(2)) {
+    for (const arg of rest.slice(2)) {
         write.newline();
         traverse(arg);
     }

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

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

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

@@ -1,3 +1,10 @@
-export const vacuum = (path, {write}) => {
+export const vacuum = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
     write('VACUUM');
+    
+    if (args.length > 0) {
+        write(' INTO ');
+        traverse(args[0]);
+    }
 };

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

@@ -0,0 +1,38 @@
+export const rowsBetween = (path, {write, traverse}) => {
+    const [begin, end] = path.get('arguments');
+    
+    write('ROWS BETWEEN ');
+    traverse(begin);
+    write(' AND ');
+    traverse(end);
+};
+
+export const preceding = (path, {write, traverse}) => {
+    const [expr] = path.get('arguments');
+    
+    if (expr?.node) {
+        traverse(expr);
+        write(' PRECEDING');
+        
+        return;
+    }
+    
+    write('UNBOUNDED PRECEDING');
+};
+
+export const following = (path, {write, traverse}) => {
+    const [expr] = path.get('arguments');
+    
+    if (expr?.node) {
+        traverse(expr);
+        write(' FOLLOWING');
+        
+        return;
+    }
+    
+    write('UNBOUNDED FOLLOWING');
+};
+
+export const currentRow = (path, {write}) => {
+    write('CURRENT ROW');
+};

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

@@ -1,35 +1,23 @@
-const isAssignment = (arg) => arg.node.type === 'AssignmentExpression';
+import {types} from '@putout/babel';
 
-export const withNamed = (path, {write, indent, traverse}) => {
+const {isAssignmentExpression} = types;
+
+export const withNamed = (path, {write, traverse}) => {
     const args = path.get('arguments');
-    const namedQueries = args.filter(isAssignment);
+    const namedQueries = args.filter(({node}) => isAssignmentExpression(node));
     const finalStatement = args.at(-1);
-    
-    write('WITH');
-    write.newline();
     const last = namedQueries.length - 1;
     
+    write('WITH ');
+    
     for (const [i, query] of namedQueries.entries()) {
-        indent.inc();
-        write.indent();
-        indent.dec();
         write(query.get('left').node.name);
         write(' AS (');
-        write.newline();
-        indent.inc();
-        indent.inc();
-        write.indent();
         traverse(query.get('right'));
-        indent.dec();
-        indent.dec();
-        write.newline();
-        indent.inc();
-        write.indent();
-        indent.dec();
         write(')');
         
         if (i < last)
-            write(',');
+            write(', ');
         
         write.newline();
     }

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

@@ -0,0 +1 @@
+export const withoutRowid = null;

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

@@ -1,5 +1,19 @@
+const isStar = ({value}) => value === '*';
+
 export const MemberExpression = (path, {write, traverse}) => {
+    const {computed, property} = path.node;
+    const isSubscript = computed && !isStar(property);
+    
     traverse(path.get('object'));
+    
+    if (isSubscript) {
+        write('[');
+        traverse(path.get('property'));
+        write(']');
+        
+        return;
+    }
+    
     write('.');
     traverse(path.get('property'));
 };

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

@@ -1,8 +1,12 @@
 export const StringLiteral = (path, {write}) => {
-    if (path.node.value === '*' || path.node.value.startsWith(':')) {
-        write(path.node.value);
-        return;
-    }
+    const {value} = path.node;
     
-    write(`'${path.node.value}'`);
+    if (value === '*' || value.startsWith(':'))
+        return write(value);
+    
+    // quoted identifier like "weird col" — written as is
+    if (value.startsWith('"') && value.endsWith('"'))
+        return write(value);
+    
+    write(`'${value.replace(/'/g, `''`)}'`);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -40,7 +40,14 @@
     "#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"
+    "#printer/test": "./test/create-printer-test.js",
+    "#parser/clause/explain": "./lib/parser/visitors/clause/explain/explain.js",
+    "#parser/clause/set-param": "./lib/parser/visitors/clause/set-param/set-param.js",
+    "#parser/clause/create-view": "./lib/parser/visitors/clause/create-view/create-view.js",
+    "#parser/clause/drop-view": "./lib/parser/visitors/clause/drop-view/drop-view.js",
+    "#parser/clause/create-extension": "./lib/parser/visitors/clause/create-extension/create-extension.js",
+    "#parser/clause/create-schema": "./lib/parser/visitors/clause/create-schema/create-schema.js",
+    "#parser/clause/grant": "./lib/parser/visitors/clause/grant/grant.js"
   },
   "scripts": {
     "test": "madrun test",