happy-sql 2.0.7 → 2.1.0

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

@@ -1,43 +1,20 @@
 import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
+import {convertGroupBy} from './group-by.js';
+import {convertHaving} from './having.js';
 
 const isString = (a) => typeof a === 'string';
 
 const {
     identifier,
     callExpression,
-    memberExpression,
     binaryExpression,
     logicalExpression,
     stringLiteral,
-    numericLiteral,
-    booleanLiteral,
-    nullLiteral,
     tsAsExpression,
     tsLiteralType,
 } = types;
 
-const convertOperand = (node) => {
-    if (node.type === 'member_expr')
-        return memberExpression(identifier(node.object.name), identifier(node.property.name));
-    
-    if (node.type === 'parameter')
-        return stringLiteral(node.text);
-    
-    if (node.type === 'number_literal')
-        return numericLiteral(node.value);
-    
-    if (node.type === 'string_literal')
-        return stringLiteral(node.value);
-    
-    if (node.type === 'boolean_literal')
-        return booleanLiteral(node.value);
-    
-    if (node.type === 'null_literal')
-        return nullLiteral(node.value);
-    
-    return identifier(node.name);
-};
-
 const opName = (op) => {
     if (Array.isArray(op))
         return op
@@ -133,7 +110,7 @@ const flattenJoins = (node, joins = []) => {
     return joins;
 };
 
-export const convertFrom = ({expr, whereClause}) => {
+export const convertFrom = ({expr, whereClause, groupByClause, havingClause}) => {
     const fromArgs = [];
     
     if (whereClause)
@@ -141,6 +118,12 @@ export const convertFrom = ({expr, whereClause}) => {
             convertCondition(whereClause.expr),
         ]));
     
+    if (groupByClause)
+        fromArgs.push(convertGroupBy(groupByClause));
+    
+    if (havingClause)
+        fromArgs.push(convertHaving(havingClause));
+    
     if (expr.type === 'join_expr') {
         const parts = flattenJoins(expr);
         return callExpression(identifier('from'), parts);

package/lib/parser/visitors/clause/from/group-by.js

@@ -0,0 +1,6 @@
+import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
+
+const {callExpression, identifier} = types;
+
+export const convertGroupBy = (clause) => callExpression(identifier('groupBy'), clause.columns.items.map(convertOperand));

package/lib/parser/visitors/clause/from/having.js

@@ -0,0 +1,8 @@
+import {types} from '@putout/babel';
+import {convertCondition} from '#parser/clause/where';
+
+const {callExpression, identifier} = types;
+
+export const convertHaving = (clause) => callExpression(identifier('having'), [
+    convertCondition(clause.expr),
+]);

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

@@ -5,6 +5,7 @@ import {convertDelete} from '#parser/clause/delete';
 import {convertWithNamed} from '#parser/clause/with-named';
 import {convertCreateTable} from '#parser/clause/create-table';
 import {convertCreateSequence} from '#parser/clause/create-sequence';
+import {convertUnionAll} from '#parser/clause/union';
 import {findClause} from '#parser/clause/find';
 
 export const convertClause = (stmt) => {
@@ -26,11 +27,21 @@ const convertInsertOrNamed = (stmt) => {
     return convertInsert(stmt);
 };
 
+const convertSelectOrNamed = (stmt) => {
+    const {clauses} = stmt;
+    
+    if (findClause(clauses, 'with_clause'))
+        return convertWithNamed(stmt);
+    
+    return convertSelect(stmt);
+};
+
 const clauseVisitors = {
-    select_stmt: convertSelect,
+    select_stmt: convertSelectOrNamed,
     insert_stmt: convertInsertOrNamed,
     update_stmt: convertUpdate,
     delete_stmt: convertDelete,
     create_table_stmt: convertCreateTable,
     create_sequence_stmt: convertCreateSequence,
+    compound_select_stmt: convertUnionAll,
 };

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

@@ -1,3 +1,11 @@
 [
-    insert(into(t, x, values(':x'))),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/insert/fixture/insert-identifier-fix.js

@@ -1,3 +1,17 @@
 [
-    insert(into(t, x, values(':x')), onConflict(x, set(y === x))),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+        onConflict(
+            x,
+            set(
+                y === x,
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    insert(into(t, [x, y], values(':x', ':y'))),
+    insert(
+        into(
+            t, [x, y],
+            values(
+                ':x',
+                ':y',
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/insert/fixture/insert-number-fix.js

@@ -1,3 +1,18 @@
 [
-    insert(into(t, x, values(':x')), onConflict(x, y, set(count === 1))),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+        onConflict(
+            x,
+            y,
+            set(
+                count === 1,
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,20 @@
 [
-    insert(into(t, x, values(':x')), onConflict(x, set(y === ':y')), returning(id)),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+        onConflict(
+            x,
+            set(
+                y === ':y',
+            ),
+        ),
+        returning(
+            id,
+        ),
+    ),
 ];

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

@@ -1,7 +1,14 @@
 [
-    insert(into(
-        CallExpression,
-        parent_id,
-        values(':parent_id'),
-    ), returning(id as 'call_id')),
+    insert(
+        into(
+            CallExpression,
+            parent_id,
+            values(
+                ':parent_id',
+            ),
+        ),
+        returning(
+            id as 'call_id',
+        ),
+    ),
 ];

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

@@ -1,7 +1,14 @@
 [
-    insert(into(
-        CallExpression,
-        parent_id,
-        values(':parent_id'),
-    ), returning(id)),
+    insert(
+        into(
+            CallExpression,
+            parent_id,
+            values(
+                ':parent_id',
+            ),
+        ),
+        returning(
+            id,
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/insert/fixture/insert-string-fix.js

@@ -1,3 +1,17 @@
 [
-    insert(into(t, x, values(':x')), onConflict(x, set(name === 'hello'))),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+        onConflict(
+            x,
+            set(
+                name === 'hello',
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/on-conflict/fixture/on-conflict-fix.js

@@ -1,3 +1,17 @@
 [
-    insert(into(t, x, values(':x')), onConflict(x, set(x === ':x'))),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+        onConflict(
+            x,
+            set(
+                x === ':x',
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/on-conflict/fixture/on-conflict-nothing-fix.js

@@ -1,3 +1,14 @@
 [
-    insert(into(t, x, values(':x')), onConflict(nothing)),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+        onConflict(
+            nothing,
+        ),
+    ),
 ];

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

@@ -1,4 +1,5 @@
 import {types} from '@putout/babel';
+import {convertCount, isCount} from '#parser/clause/count';
 
 const {
     identifier,
@@ -10,6 +11,9 @@ const {
 } = types;
 
 export const convertOperand = (node) => {
+    if (isCount(node))
+        return convertCount(node);
+    
     if (node.type === 'member_expr')
         return memberExpression(identifier(node.object.name), identifier(node.property.name));
     

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

@@ -1,3 +1,9 @@
 [
-    select('msg' as 'message', 42 as 'num', from(t)),
+    select(
+        'msg' as 'message',
+        42 as 'num',
+        from(
+            t,
+        ),
+    ),
 ];

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

@@ -1,3 +1,8 @@
 [
-    select(':file' as 'file', from(t)),
+    select(
+        ':file' as 'file',
+        from(
+            t,
+        ),
+    ),
 ];

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

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

package/lib/parser/visitors/clause/select/fixture/select-last-insert-rowid-fix.js

@@ -1,3 +1,8 @@
 [
-    select(lastInsertRowid(), from(users)),
+    select(
+        lastInsertRowid(),
+        from(
+            users,
+        ),
+    ),
 ];

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

@@ -1,3 +1,8 @@
 [
-    select(lastval(), from(users)),
+    select(
+        lastval(),
+        from(
+            users,
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    select('*', from(t, where(num === 42))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                num === 42,
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,9 @@
 [
-    select(':arg_name', id, from(t)),
+    select(
+        ':arg_name',
+        id,
+        from(
+            t,
+        ),
+    ),
 ];

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

@@ -11,6 +11,8 @@ const {
     tsLiteralType,
     callExpression,
     memberExpression,
+    numericLiteral,
+    binaryExpression,
 } = types;
 
 const convertColumn = (column) => {
@@ -32,6 +34,16 @@ const convertColumn = (column) => {
     if (column.type === 'parameter')
         return stringLiteral(column.text);
     
+    if (column.type === 'number_literal')
+        return numericLiteral(column.value);
+    
+    if (column.type === 'binary_expr')
+        return binaryExpression(
+            column.operator,
+            convertOperand(column.left),
+            convertOperand(column.right),
+        );
+    
     return identifier(column.name);
 };
 
@@ -57,12 +69,16 @@ 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 args = [
         ...convertColumns(selectClause.columns),
         fromClause && convertFrom({
             expr: fromClause.expr,
             whereClause,
+            groupByClause,
+            havingClause,
         }),
     ].filter(Boolean);
     

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

@@ -0,0 +1,10 @@
+[
+    unionAll(
+        select(
+            1,
+        ),
+        select(
+            2,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT 1 UNION ALL SELECT 2

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

@@ -0,0 +1,11 @@
+import {types} from '@putout/babel';
+import {convertClause} from '#parser/clause';
+
+const {callExpression, identifier} = types;
+
+export const convertUnionAll = (stmt) => {
+    return callExpression(identifier('unionAll'), [
+        convertClause(stmt.left),
+        convertClause(stmt.right),
+    ]);
+};

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

@@ -1,3 +1,11 @@
 [
-    update(t, set(x === ':x'), where(id === ':id')),
+    update(
+        t,
+        set(
+            x === ':x',
+        ),
+        where(
+            id === ':id',
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    update(t, set(x === y), where(id === ':id')),
+    update(
+        t,
+        set(
+            x === y,
+        ),
+        where(
+            id === ':id',
+        ),
+    ),
 ];

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

@@ -1,3 +1,8 @@
 [
-    update(t, set(x === ':x')),
+    update(
+        t,
+        set(
+            x === ':x',
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    update(t, set(x === 1), where(id === ':id')),
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            id === ':id',
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    update(t, set(name === 'hello'), where(id === ':id')),
+    update(
+        t,
+        set(
+            name === 'hello',
+        ),
+        where(
+            id === ':id',
+        ),
+    ),
 ];

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

@@ -0,0 +1,11 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            a === 1 && b === 2,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE a = 1 AND b = 2

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

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

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

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

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

@@ -0,0 +1,13 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            isNotNull(
+                y,
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE y IS NOT NULL

package/lib/parser/visitors/clause/update/fixture/update-where-is-null-fix.js

@@ -0,0 +1,13 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            isNull(
+                y,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/update/fixture/update-where-is-null.sql

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE y IS NULL

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

@@ -0,0 +1,14 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            like(
+                y,
+                '%a%',
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE y LIKE '%a%'

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

@@ -0,0 +1,11 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            a === 1 || b === 2,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE a = 1 OR b = 2

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

@@ -0,0 +1,11 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                x === true,
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x = true