happy-sql 2.3.0 → 2.4.1

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 && expr.node) {
+        traverse(expr);
+        write(' PRECEDING');
+        
+        return;
+    }
+    
+    write('UNBOUNDED PRECEDING');
+};
+
+export const following = (path, {write, traverse}) => {
+    const [expr] = path.get('arguments');
+    
+    if (expr && 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/logical-expression.js

@@ -1,4 +1,7 @@
-const needsParensIn = (node, op) => op === '&&' && node.type === 'LogicalExpression' && node.operator === '||';
+import {types} from '@putout/babel';
+
+const {isLogicalExpression} = types;
+const needsParensIn = (node, op) => op === '&&' && isLogicalExpression(node) && node.operator === '||';
 
 const printNestedOr = (node, printer) => {
     const {write, traverse} = printer;

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.1",
   "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",
@@ -76,7 +83,7 @@
   },
   "homepage": "https://github.com/coderaiser/happy-sql",
   "devDependencies": {
-    "@putout/plugin-printer": "^8.22.0",
+    "@putout/plugin-printer": "^9.0.0",
     "@putout/test": "^15.8.2",
     "eslint": "^10.8.1",
     "eslint-plugin-node": "^11.1.0",
@@ -96,7 +103,7 @@
     "@putout/printer": "^18.38.1",
     "just-camel-case": "^6.2.0",
     "redstd": "^1.0.2",
-    "sql-parser-cst": "^0.42.1",
+    "sql-parser-cst": "^0.44.1",
     "try-catch": "^4.0.9"
   }
 }