happy-sql 2.1.0 → 2.2.0

package/lib/parser/visitors/clause/transaction/fixture/begin-fix.js

@@ -0,0 +1,3 @@
+[
+    begin(),
+];

package/lib/parser/visitors/clause/transaction/fixture/begin.sql

@@ -0,0 +1 @@
+BEGIN

package/lib/parser/visitors/clause/transaction/fixture/commit-fix.js

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

package/lib/parser/visitors/clause/transaction/fixture/commit.sql

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

package/lib/parser/visitors/clause/transaction/fixture/rollback-fix.js

@@ -0,0 +1,3 @@
+[
+    rollback(),
+];

package/lib/parser/visitors/clause/transaction/fixture/rollback-to-fix.js

@@ -0,0 +1,5 @@
+[
+    rollbackTo(
+        sp1,
+    ),
+];

package/lib/parser/visitors/clause/transaction/fixture/rollback-to.sql

@@ -0,0 +1 @@
+ROLLBACK TO SAVEPOINT sp1

package/lib/parser/visitors/clause/transaction/fixture/rollback.sql

@@ -0,0 +1 @@
+ROLLBACK

package/lib/parser/visitors/clause/transaction/fixture/savepoint-fix.js

@@ -0,0 +1,5 @@
+[
+    savepoint(
+        sp1,
+    ),
+];

package/lib/parser/visitors/clause/transaction/fixture/savepoint.sql

@@ -0,0 +1 @@
+SAVEPOINT sp1

package/lib/parser/visitors/clause/transaction/transaction.js

@@ -0,0 +1,20 @@
+import {types} from '@putout/babel';
+
+const {identifier, callExpression} = types;
+
+export const convertBegin = () => callExpression(identifier('begin'), []);
+
+export const convertCommit = () => callExpression(identifier('commit'), []);
+
+export const convertRollback = (stmt) => {
+    if (stmt.savepoint)
+        return callExpression(identifier('rollbackTo'), [
+            identifier(stmt.savepoint.savepoint.name),
+        ]);
+    
+    return callExpression(identifier('rollback'), []);
+};
+
+export const convertSavepoint = (stmt) => callExpression(identifier('savepoint'), [
+    identifier(stmt.savepoint.name),
+]);

package/lib/parser/visitors/clause/union/fixture/union-distinct-fix.js

@@ -0,0 +1,16 @@
+[
+    union(
+        select(
+            id,
+            from(
+                a,
+            ),
+        ),
+        select(
+            id,
+            from(
+                b,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/union/fixture/union-distinct.sql

@@ -0,0 +1 @@
+SELECT id FROM a UNION SELECT id FROM b

package/lib/parser/visitors/clause/union/union.js

@@ -3,8 +3,25 @@ import {convertClause} from '#parser/clause';
 
 const {callExpression, identifier} = types;
 
-export const convertUnionAll = (stmt) => {
-    return callExpression(identifier('unionAll'), [
+const getOpNames = (operator) => {
+    if (Array.isArray(operator)) {
+        const names = [];
+        
+        for (const kw of operator)
+            names.push(kw.name);
+        
+        return names;
+    }
+    
+    return [operator.name];
+};
+
+export const convertUnion = (stmt) => {
+    const ops = getOpNames(stmt.operator);
+    const isAll = ops.includes('ALL');
+    const name = isAll ? 'unionAll' : 'union';
+    
+    return callExpression(identifier(name), [
         convertClause(stmt.left),
         convertClause(stmt.right),
     ]);

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

@@ -0,0 +1,14 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        updateFrom(
+            u,
+        ),
+        where(
+            t.id === u.id,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+UPDATE t SET x = 1 FROM u WHERE t.id = u.id

package/lib/parser/visitors/clause/update/fixture/update-returning-fix.js

@@ -0,0 +1,14 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            id === 1,
+        ),
+        returning(
+            id,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/update/fixture/update-returning.sql

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE id = 1 RETURNING id

package/lib/parser/visitors/clause/update/fixture/update-where-in-subquery-fix.js

@@ -0,0 +1,19 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            inQuery(
+                y,
+                select(
+                    id,
+                    from(
+                        u,
+                    ),
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/update/fixture/update-where-in-subquery.sql

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE y IN (SELECT id FROM u)

package/lib/parser/visitors/clause/update/fixture/update-where-not-in-fix.js

@@ -0,0 +1,16 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            notInList(
+                y,
+                1,
+                2,
+                3,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/update/fixture/update-where-not-in.sql

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE y NOT IN (1, 2, 3)

package/lib/parser/visitors/clause/update/update.js

@@ -1,6 +1,7 @@
 import {types} from '@putout/babel';
 import {convertWhere} from '#parser/clause/where';
 import {convertOperand} from '#parser/clause/operand';
+import {convertReturning} from '#parser/clause/returning';
 import {findClause} from '#parser/clause/find';
 
 const {
@@ -12,7 +13,9 @@ const {
 export const convertUpdate = ({clauses}) => {
     const updateClause = findClause(clauses, 'update_clause');
     const setClause = findClause(clauses, 'set_clause');
+    const fromClause = findClause(clauses, 'from_clause');
     const whereClause = findClause(clauses, 'where_clause');
+    const returningClause = findClause(clauses, 'returning_clause');
     
     const table = identifier(updateClause.tables.items[0].name);
     const setArgs = [];
@@ -26,8 +29,14 @@ export const convertUpdate = ({clauses}) => {
     const args = [
         table,
         setCall,
+        fromClause && convertFromClause(fromClause),
         whereClause && convertWhere(whereClause),
+        returningClause && convertReturning(returningClause),
     ].filter(Boolean);
     
     return callExpression(identifier('update'), args);
 };
+
+const convertFromClause = (fromClause) => callExpression(identifier('updateFrom'), [
+    identifier(fromClause.expr.name),
+]);

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

@@ -0,0 +1,3 @@
+[
+    vacuum(),
+];

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

@@ -0,0 +1 @@
+VACUUM

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

@@ -0,0 +1,18 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                id > ALL(
+                    select(
+                        id,
+                        from(
+                            u,
+                        ),
+                    ),
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-all-subquery.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE id > ALL(SELECT id FROM u)

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

@@ -0,0 +1,17 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                id === ANY(
+                    array(
+                        1,
+                        2,
+                        3,
+                    ),
+                ),
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE id = ANY(ARRAY[1, 2, 3])

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

@@ -0,0 +1,15 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where(
+                between(
+                    age,
+                    18,
+                    65,
+                ),
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM users WHERE age BETWEEN 18 AND 65

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

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

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

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

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

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                ilike(
+                    name,
+                    '%foo%',
+                ),
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE name ILIKE '%foo%'

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

@@ -0,0 +1,19 @@
+[
+    select(
+        id,
+        from(
+            t,
+            where(
+                inQuery(
+                    id,
+                    select(
+                        user_id,
+                        from(
+                            orders,
+                        ),
+                    ),
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-in-subquery.sql

@@ -0,0 +1 @@
+SELECT id FROM t WHERE id IN (SELECT user_id FROM orders)

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

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                isDistinctFrom(
+                    a,
+                    b,
+                ),
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE a IS DISTINCT FROM b

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

@@ -0,0 +1,11 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                a === 1 || b === 2 && c === 3,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-nested-parens.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE (a = 1 OR b = 2) AND c = 3

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

@@ -0,0 +1,15 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                notBetween(
+                    x,
+                    1,
+                    10,
+                ),
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x NOT BETWEEN 1 AND 10

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

@@ -0,0 +1,18 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                notExists(
+                    select(
+                        1,
+                        from(
+                            u,
+                        ),
+                    ),
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-not-exists.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE NOT EXISTS (SELECT 1 FROM u)

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

@@ -0,0 +1,16 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where(
+                notInList(
+                    id,
+                    1,
+                    2,
+                    3,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-not-in.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE id NOT IN (1, 2, 3)

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

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                notLike(
+                    name,
+                    '%x%',
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-not-like.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE name NOT LIKE '%x%'

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

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                similarTo(
+                    name,
+                    '%foo%',
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-similar-to.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE name SIMILAR TO '%foo%'

package/lib/parser/visitors/clause/where/where.js

@@ -1,82 +1,58 @@
 import {types} from '@putout/babel';
 import {convertOperand} from '#parser/clause/operand';
-
-const isString = (a) => typeof a === 'string';
+import {convertClause} from '#parser/clause';
+import {convertBinary} from '#parser/clause/binary';
 
 const {
     logicalExpression,
     identifier,
     callExpression,
-    binaryExpression,
 } = types;
 
-const opName = (op) => {
-    if (Array.isArray(op))
-        return op
-            .map((k) => k.name)
-            .join(' ');
+const convertAnd = (node) => logicalExpression('&&', convertCondition(node.left), convertCondition(node.right));
+const convertOr = (node) => logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
+
+const isNotBetween = (node) => Array.isArray(node.betweenKw) && node.betweenKw[0].name === 'NOT';
+
+export const convertBetween = (node) => {
+    const args = [
+        convertOperand(node.left),
+        convertOperand(node.begin),
+        convertOperand(node.end),
+    ];
     
-    if (isString(op))
-        return op;
+    if (isNotBetween(node))
+        return callExpression(identifier('notBetween'), args);
     
-    return op?.name ?? '';
+    return callExpression(identifier('between'), args);
 };
 
-const SQL_TO_JS_OP = {
-    '=': '===',
-    '!=': '!==',
-    '>=': '>=',
-    '<=': '<=',
-    '>': '>',
-    '<': '<',
-};
-
-const convertAnd = (node) => logicalExpression('&&', convertCondition(node.left), convertCondition(node.right));
-const convertOr = (node) => logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
+const isExists = (node) => node.type === 'prefix_op_expr' && node.operator.name === 'EXISTS';
+const isNotExists = (node) => node.type === 'prefix_op_expr' && node.operator.name === 'NOT' && isExists(node.expr);
+const isParenExpr = (node) => node.type === 'paren_expr';
 
-const convertBinary = (node) => {
-    const op = opName(node.operator);
+export const convertCondition = (node) => {
+    if (node.operator && node.operator.name === 'AND')
+        return convertAnd(node);
     
-    if (op === 'LIKE')
-        return callExpression(identifier('like'), [
-            convertOperand(node.left),
-            convertOperand(node.right),
-        ]);
+    if (node.operator && node.operator.name === 'OR')
+        return convertOr(node);
     
-    if (op === 'IS')
-        return callExpression(identifier('isNull'), [
-            convertOperand(node.left),
-        ]);
+    if (node.type === 'between_expr')
+        return convertBetween(node);
     
-    if (op === 'IS NOT')
-        return callExpression(identifier('isNotNull'), [
-            convertOperand(node.left),
+    if (isNotExists(node))
+        return callExpression(identifier('notExists'), [
+            convertClause(node.expr.expr.expr),
         ]);
     
-    if (op === 'IN') {
-        const items = node.right.expr.items.map(convertOperand);
-        
-        return callExpression(identifier('inList'), [
-            convertOperand(node.left),
-            ...items,
+    if (isExists(node))
+        return callExpression(identifier('exists'), [
+            convertClause(node.expr.expr),
         ]);
-    }
     
-    const jsOp = SQL_TO_JS_OP[op] ?? '===';
-    
-    return binaryExpression(
-        jsOp,
-        convertOperand(node.left),
-        convertOperand(node.right),
-    );
-};
-
-export const convertCondition = (node) => {
-    if (node.operator?.name === 'AND')
-        return convertAnd(node);
-    
-    if (node.operator?.name === 'OR')
-        return convertOr(node);
+    if (isParenExpr(node))
+        return convertCondition(node.expr);
     
     return convertBinary(node);
 };

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

@@ -1,4 +1,11 @@
-export const ArrayExpression = (path, {write, traverse}) => {
+import {isJsonTuple, printJsonTuple} from './call-expression/clauses/json-op.js';
+
+export const ArrayExpression = (path, printer) => {
+    const {write, traverse} = printer;
+    
+    if (isJsonTuple(path.node))
+        return printJsonTuple(path, printer);
+    
     const elements = path.get('elements');
     const n = elements.length - 1;
     

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

@@ -0,0 +1,8 @@
+export const BooleanLiteral = (path, {write}) => {
+    const {value} = path.node;
+    
+    if (value)
+        return write('TRUE');
+    
+    write('FALSE');
+};