happy-sql 2.1.0 → 2.2.0

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

@@ -0,0 +1,32 @@
+import {types} from '@putout/babel';
+
+const {
+    identifier,
+    callExpression,
+    stringLiteral,
+    tsAsExpression,
+    tsLiteralType,
+} = types;
+
+const convertReturningItem = (item) => {
+    if (item.type === 'all_columns')
+        return stringLiteral('*');
+    
+    if (item.type === 'alias') {
+        const {name} = item.expr;
+        const aliasName = item.alias.name;
+        
+        return tsAsExpression(identifier(name), tsLiteralType(stringLiteral(aliasName)));
+    }
+    
+    return identifier(item.name);
+};
+
+export const convertReturning = (returningClause) => {
+    const args = [];
+    
+    for (const item of returningClause.columns.items)
+        args.push(convertReturningItem(item));
+    
+    return callExpression(identifier('returning'), args);
+};

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

@@ -0,0 +1,10 @@
+[
+    select(
+        ABS(
+            x,
+        ),
+        from(
+            t,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT ABS(x) FROM t

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

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

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

@@ -0,0 +1 @@
+SELECT ARRAY['a', 'b'] FROM t

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

@@ -0,0 +1,10 @@
+[
+    select(
+        avg(
+            score,
+        ),
+        from(
+            results,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT AVG(score) FROM results

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

@@ -0,0 +1,9 @@
+[
+    select(
+        true,
+        false,
+        from(
+            t,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT TRUE, FALSE FROM t

package/lib/parser/visitors/clause/select/fixture/select-case-when-alias-fix.js

@@ -0,0 +1,14 @@
+[
+    select(
+        caseWhen(
+            kind === 'const',
+            1,
+            else_(
+                0,
+            ),
+        ) as 'flag',
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-case-when-alias.sql

@@ -0,0 +1 @@
+SELECT CASE WHEN kind = 'const' THEN 1 ELSE 0 END AS flag FROM t

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

@@ -0,0 +1,16 @@
+[
+    select(
+        caseWhen(
+            kind === 'const',
+            1,
+            kind === 'let',
+            2,
+            else_(
+                0,
+            ),
+        ),
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-case-when.sql

@@ -0,0 +1 @@
+SELECT CASE WHEN kind = 'const' THEN 1 WHEN kind = 'let' THEN 2 ELSE 0 END FROM t

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

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

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

@@ -0,0 +1,11 @@
+[
+    select(
+        cast(
+            price,
+            INTEGER,
+        ),
+        from(
+            products,
+        ),
+    ),
+];

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-count-col-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        count(
+            id,
+        ),
+        from(
+            users,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-count-col.sql

@@ -0,0 +1 @@
+SELECT COUNT(id) FROM users

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

@@ -0,0 +1,10 @@
+[
+    select(
+        distinct(
+            name,
+        ),
+        from(
+            users,
+        ),
+    ),
+];

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

@@ -0,0 +1,11 @@
+[
+    select(
+        distinct(
+            name,
+            age,
+        ),
+        from(
+            users,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT DISTINCT name, age FROM users

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

@@ -0,0 +1 @@
+SELECT DISTINCT name FROM users

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-min-max-fix.js

@@ -0,0 +1,13 @@
+[
+    select(
+        min(
+            price,
+        ),
+        max(
+            price,
+        ),
+        from(
+            products,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-min-max.sql

@@ -0,0 +1 @@
+SELECT MIN(price), MAX(price) FROM products

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-sum-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        sum(
+            amount,
+        ),
+        from(
+            orders,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT SUM(amount) FROM orders

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,23 +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 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'), []);
     
-    return callExpression(identifier('lastval'), []);
+    if (lower === 'lastval')
+        return callExpression(identifier('lastval'), []);
+    
+    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);
+    
+    // preserve original casing (RANK, LAG, LEAD, UPPER, etc.)
+    return callExpression(identifier(name), args);
 };
 
 const convertColumns = (columns) => {
@@ -65,20 +157,31 @@ const convertColumns = (columns) => {
     return columns.items.map(convertColumn);
 };
 
+const isDistinct = (selectClause) => selectClause.modifiers.some(({type}) => type === 'select_distinct');
+
 export const convertSelect = ({clauses}) => {
     const selectClause = findClause(clauses, 'select_clause');
     const fromClause = findClause(clauses, 'from_clause');
     const whereClause = findClause(clauses, 'where_clause');
     const groupByClause = findClause(clauses, 'group_by_clause');
     const havingClause = findClause(clauses, 'having_clause');
+    const orderByClause = findClause(clauses, 'order_by_clause');
+    const limitClause = findClause(clauses, 'limit_clause');
+    
+    const cols = convertColumns(selectClause.columns);
+    const selectArgs = isDistinct(selectClause) ? [
+        callExpression(identifier('distinct'), cols),
+    ] : cols;
     
     const args = [
-        ...convertColumns(selectClause.columns),
+        ...selectArgs,
         fromClause && convertFrom({
             expr: fromClause.expr,
             whereClause,
             groupByClause,
             havingClause,
+            orderByClause,
+            limitClause,
         }),
     ].filter(Boolean);