happy-sql 2.1.0 → 2.2.0

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

@@ -1,5 +1,6 @@
 import {types} from '@putout/babel';
 import {convertWhere} from '#parser/clause/where';
+import {convertReturning} from '#parser/clause/returning';
 import {findClause} from '#parser/clause/find';
 
 const {identifier, callExpression} = types;
@@ -7,12 +8,14 @@ const {identifier, callExpression} = types;
 export const convertDelete = ({clauses}) => {
     const deleteClause = findClause(clauses, 'delete_clause');
     const whereClause = findClause(clauses, 'where_clause');
+    const returningClause = findClause(clauses, 'returning_clause');
     
     const table = identifier(deleteClause.tables.items[0].name);
     
     const args = [
         callExpression(identifier('from'), [table]),
         whereClause && convertWhere(whereClause),
+        returningClause && convertReturning(returningClause),
     ].filter(Boolean);
     
     return callExpression(identifier('deleteFrom'), args);

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

@@ -0,0 +1,13 @@
+[
+    deleteFrom(
+        from(
+            t,
+        ),
+        where(
+            id === 1,
+        ),
+        returning(
+            id,
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+DELETE FROM t WHERE id = 1 RETURNING id

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

@@ -0,0 +1,14 @@
+[
+    deleteFrom(
+        from(
+            t,
+        ),
+        where(
+            between(
+                id,
+                10,
+                20,
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+DELETE FROM t WHERE id BETWEEN 10 AND 20

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

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

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

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

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

@@ -0,0 +1,12 @@
+import {types} from '@putout/babel';
+
+const {identifier, callExpression} = types;
+
+export const convertDropIndex = (stmt) => {
+    const args = [];
+    
+    for (const idx of stmt.indexes.items)
+        args.push(identifier(idx.name));
+    
+    return callExpression(identifier('dropIndex'), args);
+};

package/lib/parser/visitors/clause/drop-index/fixture/drop-index-fix.js

@@ -0,0 +1,5 @@
+[
+    dropIndex(
+        idx,
+    ),
+];

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

@@ -0,0 +1,6 @@
+[
+    dropIndex(
+        idx1,
+        idx2,
+    ),
+];

package/lib/parser/visitors/clause/drop-index/fixture/drop-index-multi.sql

@@ -0,0 +1 @@
+DROP INDEX idx1, idx2

package/lib/parser/visitors/clause/drop-index/fixture/drop-index.sql

@@ -0,0 +1 @@
+DROP INDEX idx

package/lib/parser/visitors/clause/drop-table/drop-table.js

@@ -0,0 +1,18 @@
+import {types} from '@putout/babel';
+
+const {identifier, callExpression} = types;
+
+export const convertDropTable = (stmt) => {
+    const tableArgs = [];
+    
+    for (const table of stmt.tables.items)
+        tableArgs.push(identifier(table.name));
+    
+    if (stmt.ifExistsKw)
+        return callExpression(identifier('dropTable'), [
+            callExpression(identifier('ifExists'), []),
+            ...tableArgs,
+        ]);
+    
+    return callExpression(identifier('dropTable'), tableArgs);
+};

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

@@ -0,0 +1,5 @@
+[
+    dropTable(
+        users,
+    ),
+];

package/lib/parser/visitors/clause/drop-table/fixture/drop-table-if-exists-fix.js

@@ -0,0 +1,6 @@
+[
+    dropTable(
+        ifExists(),
+        users,
+    ),
+];

package/lib/parser/visitors/clause/drop-table/fixture/drop-table-if-exists.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS users

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

@@ -0,0 +1,6 @@
+[
+    dropTable(
+        a,
+        b,
+    ),
+];

package/lib/parser/visitors/clause/drop-table/fixture/drop-table-multi.sql

@@ -0,0 +1 @@
+DROP TABLE a, b

package/lib/parser/visitors/clause/drop-table/fixture/drop-table.sql

@@ -0,0 +1 @@
+DROP TABLE users

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

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

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

@@ -0,0 +1 @@
+SELECT data -> 'name' FROM users

package/lib/parser/visitors/clause/fixture/json-contained-by-fix.js

@@ -0,0 +1,9 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where([data, '<@', '{"name":"x"}']),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/fixture/json-contained-by.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE data <@ '{"name":"x"}'

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

@@ -0,0 +1,9 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where([data, '@>', '{"name":"x"}']),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/fixture/json-contains.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE data @> '{"name":"x"}'

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

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

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

@@ -0,0 +1 @@
+SELECT data ->> 'name' FROM users

package/lib/parser/visitors/clause/fixture/json-has-all-keys-fix.js

@@ -0,0 +1,12 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where([data, '?&', array(
+                    'email',
+                    'name',
+                )]),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/fixture/json-has-all-keys.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE data ?& ARRAY['email','name']

package/lib/parser/visitors/clause/fixture/json-has-any-key-fix.js

@@ -0,0 +1,12 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where([data, '?|', array(
+                    'email',
+                    'name',
+                )]),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/fixture/json-has-any-key.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE data ?| ARRAY['email','name']

package/lib/parser/visitors/clause/fixture/json-has-key-fix.js

@@ -0,0 +1,9 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where([data, '?', 'email']),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/fixture/json-has-key.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE data ? 'email'

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

@@ -0,0 +1,5 @@
+[
+    select([data, '#>', '{user,name}'], from(
+        users,
+    )),
+];

package/lib/parser/visitors/clause/fixture/json-path-text-fix.js

@@ -0,0 +1,5 @@
+[
+    select([data, '#>>', '{user,name}'], from(
+        users,
+    )),
+];

package/lib/parser/visitors/clause/fixture/json-path-text.sql

@@ -0,0 +1 @@
+SELECT data #>> '{user,name}' FROM users

package/lib/parser/visitors/clause/fixture/json-path.sql

@@ -0,0 +1 @@
+SELECT data #> '{user,name}' FROM users

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

@@ -0,0 +1,12 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where([data, '@>', pgCast(
+                    '{}',
+                    jsonb,
+                )]),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE data @> '{}'::jsonb

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

@@ -0,0 +1,11 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            crossJoin(
+                u,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/cross-join.sql

@@ -0,0 +1 @@
+SELECT * FROM t CROSS JOIN u

package/lib/parser/visitors/clause/from/fixture/full-outer-join-fix.js

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            a,
+            fullOuterJoin(
+                b,
+                on(
+                    a.id === b.id,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/full-outer-join.sql

@@ -0,0 +1 @@
+SELECT * FROM a FULL OUTER JOIN b ON a.id = b.id

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

@@ -0,0 +1,12 @@
+[
+    select(
+        '*',
+        from(
+            generateSeries(
+                1,
+                10,
+                2,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/generate-series.sql

@@ -0,0 +1 @@
+SELECT * FROM generate_series(1, 10, 2)

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

@@ -0,0 +1,17 @@
+[
+    select(
+        dept,
+        count(
+            '*',
+        ),
+        from(
+            emp,
+            groupBy(
+                dept,
+            ),
+            orderBy(
+                dept,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/group-by-order-by.sql

@@ -0,0 +1 @@
+SELECT dept, COUNT(*) FROM emp GROUP BY dept ORDER BY dept

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

@@ -0,0 +1,14 @@
+[
+    select(
+        dept,
+        sum(
+            salary,
+        ),
+        from(
+            emp,
+            groupBy(
+                dept,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/group-by-sum-having-fix.js

@@ -0,0 +1,19 @@
+[
+    select(
+        dept,
+        sum(
+            salary,
+        ),
+        from(
+            emp,
+            groupBy(
+                dept,
+            ),
+            having(
+                sum(
+                    salary,
+                ) > 1000,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/group-by-sum-having.sql

@@ -0,0 +1 @@
+SELECT dept, SUM(salary) FROM emp GROUP BY dept HAVING SUM(salary) > 1000

package/lib/parser/visitors/clause/from/fixture/group-by-sum.sql

@@ -0,0 +1 @@
+SELECT dept, SUM(salary) FROM emp GROUP BY dept

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

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            innerJoin(
+                orders,
+                on(
+                    users.id === orders.user_id,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/inner-join.sql

@@ -0,0 +1 @@
+SELECT * FROM users INNER JOIN orders ON users.id = orders.user_id

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

@@ -0,0 +1,10 @@
+[
+    select(
+        '*',
+        from(
+            jsonEach(
+                '[1,2]',
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/json-each.sql

@@ -0,0 +1 @@
+SELECT * FROM json_each('[1,2]')

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

@@ -0,0 +1,15 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            lateralJoin(
+                lateralSubquery(
+                    select(
+                        1,
+                    ),
+                ) as 'sub',
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/lateral-join.sql

@@ -0,0 +1 @@
+SELECT * FROM t, LATERAL (SELECT 1) sub

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

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            leftJoin(
+                orders,
+                on(
+                    users.id === orders.user_id,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/left-join.sql

@@ -0,0 +1 @@
+SELECT * FROM users LEFT JOIN orders ON users.id = orders.user_id

package/lib/parser/visitors/clause/from/fixture/left-outer-join-fix.js

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            leftOuterJoin(
+                orders,
+                on(
+                    users.id === orders.user_id,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/left-outer-join.sql

@@ -0,0 +1 @@
+SELECT * FROM users LEFT OUTER JOIN orders ON users.id = orders.user_id

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

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

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

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

package/lib/parser/visitors/clause/from/fixture/limit-offset.sql

@@ -0,0 +1 @@
+SELECT id FROM users LIMIT 10 OFFSET 5

package/lib/parser/visitors/clause/from/fixture/limit.sql

@@ -0,0 +1 @@
+SELECT id FROM users LIMIT 10

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

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

package/lib/parser/visitors/clause/from/fixture/natural-join.sql

@@ -0,0 +1 @@
+SELECT * FROM a NATURAL JOIN b

package/lib/parser/visitors/clause/from/fixture/order-by-desc-fix.js

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

package/lib/parser/visitors/clause/from/fixture/order-by-desc.sql

@@ -0,0 +1 @@
+SELECT id FROM users ORDER BY name DESC

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

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

package/lib/parser/visitors/clause/from/fixture/order-by-multi-fix.js

@@ -0,0 +1,14 @@
+[
+    select(
+        id,
+        from(
+            users,
+            orderBy(
+                name,
+                desc(
+                    id,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/order-by-multi.sql

@@ -0,0 +1 @@
+SELECT id FROM users ORDER BY name ASC, id DESC

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

@@ -0,0 +1 @@
+SELECT id FROM users ORDER BY name

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

@@ -0,0 +1,14 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            rightJoin(
+                orders,
+                on(
+                    users.id === orders.user_id,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/right-join.sql

@@ -0,0 +1 @@
+SELECT * FROM users RIGHT JOIN orders ON users.id = orders.user_id