happy-sql 2.1.1 → 2.2.0

package/lib/parser/visitors/clause/select/fixture/select-cast-int.sql

@@ -0,0 +1 @@
+SELECT CAST(price AS INTEGER) FROM products

package/lib/parser/visitors/clause/select/fixture/select-cast.sql

@@ -0,0 +1 @@
+SELECT CAST(id AS TEXT) FROM t

package/lib/parser/visitors/clause/select/fixture/select-coalesce-fix.js

@@ -0,0 +1,11 @@
+[
+    select(
+        COALESCE(
+            name,
+            id,
+        ),
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-coalesce-str-fix.js

@@ -0,0 +1,11 @@
+[
+    select(
+        COALESCE(
+            name,
+            'default',
+        ),
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-coalesce-str.sql

@@ -0,0 +1 @@
+SELECT COALESCE(name, 'default') FROM t

package/lib/parser/visitors/clause/select/fixture/select-coalesce.sql

@@ -0,0 +1 @@
+SELECT COALESCE(name, id) FROM t

package/lib/parser/visitors/clause/select/fixture/select-concat-fix.js

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

package/lib/parser/visitors/clause/select/fixture/select-concat.sql

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

package/lib/parser/visitors/clause/select/fixture/select-extract-fix.js

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

package/lib/parser/visitors/clause/select/fixture/select-extract.sql

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

package/lib/parser/visitors/clause/select/fixture/select-json-arrow-fix.js

@@ -0,0 +1,5 @@
+[
+    select([data, '->', 'key'], from(
+        t,
+    )),
+];

package/lib/parser/visitors/clause/select/fixture/select-json-arrow.sql

@@ -0,0 +1 @@
+SELECT data -> 'key' FROM t

package/lib/parser/visitors/clause/select/fixture/select-json-double-arrow-fix.js

@@ -0,0 +1,5 @@
+[
+    select([data, '->>', 'key'], from(
+        t,
+    )),
+];

package/lib/parser/visitors/clause/select/fixture/select-json-double-arrow.sql

@@ -0,0 +1 @@
+SELECT data ->> 'key' FROM t

package/lib/parser/visitors/clause/select/fixture/select-lag-fix.js

@@ -0,0 +1,15 @@
+[
+    select(
+        over(
+            LAG(
+                x,
+            ),
+            orderBy(
+                id,
+            ),
+        ),
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-lag.sql

@@ -0,0 +1 @@
+SELECT LAG(x) OVER (ORDER BY id) FROM t

package/lib/parser/visitors/clause/select/fixture/select-null-fix.js

@@ -0,0 +1,8 @@
+[
+    select(
+        null,
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-null.sql

@@ -0,0 +1 @@
+SELECT NULL FROM t

package/lib/parser/visitors/clause/select/fixture/select-over-fix.js

@@ -0,0 +1,17 @@
+[
+    select(
+        id,
+        over(
+            ROW_NUMBER(),
+            partitionBy(
+                kind,
+            ),
+            orderBy(
+                id,
+            ),
+        ),
+        from(
+            users,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-over-order-by-fix.js

@@ -0,0 +1,13 @@
+[
+    select(
+        over(
+            ROW_NUMBER(),
+            orderBy(
+                id,
+            ),
+        ),
+        from(
+            users,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-over-order-by.sql

@@ -0,0 +1 @@
+SELECT ROW_NUMBER() OVER (ORDER BY id) FROM users

package/lib/parser/visitors/clause/select/fixture/select-over-partition-by-fix.js

@@ -0,0 +1,15 @@
+[
+    select(
+        over(
+            sum(
+                amount,
+            ),
+            partitionBy(
+                kind,
+            ),
+        ),
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-over-partition-by.sql

@@ -0,0 +1 @@
+SELECT sum(amount) OVER (PARTITION BY kind) FROM t

package/lib/parser/visitors/clause/select/fixture/select-over-partition-multi-fix.js

@@ -0,0 +1,14 @@
+[
+    select(
+        over(
+            ROW_NUMBER(),
+            partitionBy(
+                kind,
+                name,
+            ),
+        ),
+        from(
+            users,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-over-partition-multi.sql

@@ -0,0 +1 @@
+SELECT ROW_NUMBER() OVER (PARTITION BY kind, name) FROM users

package/lib/parser/visitors/clause/select/fixture/select-over.sql

@@ -0,0 +1 @@
+SELECT id, ROW_NUMBER() OVER (PARTITION BY kind ORDER BY id) FROM users

package/lib/parser/visitors/clause/select/fixture/select-rank-fix.js

@@ -0,0 +1,15 @@
+[
+    select(
+        over(
+            RANK(),
+            orderBy(
+                desc(
+                    score,
+                ),
+            ),
+        ),
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-rank.sql

@@ -0,0 +1 @@
+SELECT RANK() OVER (ORDER BY score DESC) FROM t

package/lib/parser/visitors/clause/select/fixture/select-table-star-fix.js

@@ -0,0 +1,8 @@
+[
+    select(
+        u['*'],
+        from(
+            users as 'u',
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-table-star.sql

@@ -0,0 +1 @@
+SELECT u.* FROM users AS u

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

@@ -1,8 +1,16 @@
 import {types} from '@putout/babel';
-import {convertOperand} from '#parser/clause/operand';
+import {
+    convertOperand,
+    convertMemberExpr,
+} from '#parser/clause/operand';
 import {convertFrom} from '#parser/clause/from';
 import {convertCount, isCount} from '#parser/clause/count';
+import {convertCaseWhen} from '#parser/clause/case-when';
+import {convertBinary} from '#parser/clause/binary';
 import {findClause} from '#parser/clause/find';
+import {convertOrderBy} from '../from/order-by.js';
+
+const isString = (a) => typeof a === 'string';
 
 const {
     identifier,
@@ -10,11 +18,36 @@ const {
     tsAsExpression,
     tsLiteralType,
     callExpression,
-    memberExpression,
     numericLiteral,
-    binaryExpression,
+    booleanLiteral,
+    nullLiteral,
 } = types;
 
+const getTypeName = ({name}) => {
+    if (isString(name))
+        return name;
+    
+    return name.name;
+};
+
+const convertCast = (column) => {
+    const {expr, dataType} = column.args.expr;
+    
+    return callExpression(identifier('cast'), [
+        convertOperand(expr),
+        identifier(getTypeName(dataType)),
+    ]);
+};
+
+const convertExtract = (column) => {
+    const {unit, expr} = column.args.expr;
+    
+    return callExpression(identifier('extract'), [
+        identifier(unit.unitKw.name),
+        convertOperand(expr),
+    ]);
+};
+
 const convertColumn = (column) => {
     if (isCount(column))
         return convertCount(column);
@@ -22,6 +55,15 @@ const convertColumn = (column) => {
     if (column.type === 'func_call')
         return convertFuncCall(column);
     
+    if (column.type === 'cast_expr')
+        return convertCast(column);
+    
+    if (column.type === 'extract_expr')
+        return convertExtract(column);
+    
+    if (column.type === 'case_expr')
+        return convertCaseWhen(column);
+    
     if (column.type === 'alias')
         return tsAsExpression(convertOperand(column.expr), tsLiteralType(stringLiteral(column.alias.name)));
     
@@ -29,7 +71,7 @@ const convertColumn = (column) => {
         return stringLiteral(column.value);
     
     if (column.type === 'member_expr')
-        return memberExpression(identifier(column.object.name), identifier(column.property.name));
+        return convertMemberExpr(column);
     
     if (column.type === 'parameter')
         return stringLiteral(column.text);
@@ -37,41 +79,73 @@ const convertColumn = (column) => {
     if (column.type === 'number_literal')
         return numericLiteral(column.value);
     
+    if (column.type === 'null_literal')
+        return nullLiteral();
+    
+    if (column.type === 'boolean_literal')
+        return booleanLiteral(column.value);
+    
     if (column.type === 'binary_expr')
-        return binaryExpression(
-            column.operator,
-            convertOperand(column.left),
-            convertOperand(column.right),
-        );
+        return convertBinary(column);
+    
+    if (column.type === 'array_literal_expr')
+        return convertOperand(column);
     
     return identifier(column.name);
 };
 
-const AGGREGATE_NAMES = new Set([
+const convertOverClause = (over) => {
+    const result = [];
+    const {partitionBy, orderBy} = over.window.expr;
+    
+    if (partitionBy)
+        result.push(callExpression(identifier('partitionBy'), partitionBy.specifications.items.map(convertOperand)));
+    
+    if (orderBy)
+        result.push(convertOrderBy(orderBy));
+    
+    return result;
+};
+
+const convertOver = (column, fnNode) => callExpression(identifier('over'), [
+    fnNode,
+    ...convertOverClause(column.over),
+]);
+
+const LOWERCASE_FUNCS = new Set([
     'sum',
     'avg',
     'min',
     'max',
+    'count',
+    'last_insert_rowid',
+    'lastval',
 ]);
 
 const convertFuncCall = (column) => {
     const {name} = column.name;
     const lower = name.toLowerCase();
     
-    if (name === 'last_insert_rowid')
+    if (lower === 'last_insert_rowid')
         return callExpression(identifier('lastInsertRowid'), []);
     
-    if (name === 'lastval')
+    if (lower === 'lastval')
         return callExpression(identifier('lastval'), []);
     
-    if (AGGREGATE_NAMES.has(lower)) {
-        const {items} = column.args.expr.args;
-        const args = items.map(convertOperand);
-        
+    const {items} = column.args.expr.args;
+    const args = [];
+    
+    for (const item of items)
+        args.push(convertOperand(item));
+    
+    if (column.over)
+        return convertOver(column, callExpression(identifier(LOWERCASE_FUNCS.has(lower) ? lower : name), args));
+    
+    if (LOWERCASE_FUNCS.has(lower))
         return callExpression(identifier(lower), args);
-    }
     
-    return callExpression(identifier(name), []);
+    // preserve original casing (RANK, LAG, LEAD, UPPER, etc.)
+    return callExpression(identifier(name), args);
 };
 
 const convertColumns = (columns) => {

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/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)