happy-sql 1.5.2 → 1.6.0

package/ChangeLog

@@ -1,3 +1,19 @@
+2026.08.15, v1.6.0
+
+fix:
+- 92886e4 binary-expression: replace ?? with object map
+- fbe9fd9 lastval: print lowercase lastval()
+
+feature:
+- 07111c0 create sequence: add
+- a032611 create-sequence: add
+- e3d85bf create-sequence: add
+
+2026.08.15, v1.5.3
+
+feature:
+- e4a8ea9 happy-sql: identity column support
+
 2026.08.15, v1.5.2
 
 feature:

package/lib/parser/visitors/clause/column-definition/column-definition.js

@@ -15,6 +15,18 @@ const convertConstraint = (constraint) => {
     if (constraint.type === 'constraint_primary_key')
         return callExpression(identifier('primaryKey'), []);
     
+    if (constraint.type === 'constraint_generated') {
+        const kws = [];
+        
+        for (const kw of constraint.generatedKw)
+            kws.push(kw.name);
+        
+        if (kws.includes('DEFAULT'))
+            return callExpression(identifier('identityByDefault'), []);
+        
+        return callExpression(identifier('identity'), []);
+    }
+    
     return callExpression(identifier('autoIncrement'), []);
 };
 

package/lib/parser/visitors/clause/create-sequence/create-sequence.js

@@ -0,0 +1,7 @@
+import {types} from '@putout/babel';
+
+const {identifier, callExpression} = types;
+
+export const convertCreateSequence = ({name}) => callExpression(identifier('createSequence'), [
+    identifier(name.name),
+]);

package/lib/parser/visitors/clause/create-sequence/fixture/create-sequence-fix.js

@@ -0,0 +1,4 @@
+[
+    createSequence(users_id_seq),
+];
+

package/lib/parser/visitors/clause/create-sequence/fixture/create-sequence.sql

@@ -0,0 +1,2 @@
+CREATE SEQUENCE users_id_seq
+

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-always-fix.js

@@ -0,0 +1,5 @@
+[
+    createTable(t, [
+        column(id, BIGINT, identity(), primaryKey()),
+    ]),
+];

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-always.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY)

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-by-default-fix.js

@@ -0,0 +1,5 @@
+[
+    createTable(t, [
+        column(id, BIGINT, identityByDefault(), primaryKey()),
+    ]),
+];

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-by-default.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY)

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

@@ -78,6 +78,7 @@ const convertBinary = (node) => {
     
     if (op === 'IN') {
         const items = node.right.expr.items.map(convertOperand);
+        
         return callExpression(identifier('inList'), [
             convertOperand(node.left),
             ...items,

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

@@ -4,6 +4,7 @@ import {convertUpdate} from '#parser/clause/update';
 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 {findClause} from '#parser/clause/find';
 
 export const convertClause = (stmt) => {
@@ -31,4 +32,5 @@ const clauseVisitors = {
     update_stmt: convertUpdate,
     delete_stmt: convertDelete,
     create_table_stmt: convertCreateTable,
+    create_sequence_stmt: convertCreateSequence,
 };

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

@@ -1 +1 @@
-SELECT LASTVAL() FROM users
+SELECT lastval() FROM users

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

@@ -55,6 +55,7 @@ const convertBinary = (node) => {
     
     if (op === 'IN') {
         const items = node.right.expr.items.map(convertOperand);
+        
         return callExpression(identifier('inList'), [
             convertOperand(node.left),
             ...items,

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

@@ -1,6 +1,10 @@
 const JS_TO_SQL_OP = {
     '===': '=',
     '!==': '!=',
+    '>=': '>=',
+    '<=': '<=',
+    '>': '>',
+    '<': '<',
 };
 
 export const BinaryExpression = (path, {write, traverse}) => {
@@ -8,6 +12,6 @@ export const BinaryExpression = (path, {write, traverse}) => {
     
     const op = path.node.operator;
     
-    write(` ${JS_TO_SQL_OP[op] ?? op} `);
+    write(` ${JS_TO_SQL_OP[op] || op} `);
     traverse(path.get('right'));
 };

package/lib/printer/visitors/call-expression/clauses/clauses.js

@@ -16,6 +16,7 @@ import {returning} from './returning/returning.js';
 import {as} from './as/as.js';
 import {withNamed} from './with-named/with-named.js';
 import {createTable} from './create-table/create-table.js';
+import {createSequence} from './create-sequence/create-sequence.js';
 import {column} from './column/column.js';
 import {autoIncrement} from './auto-increment/auto-increment.js';
 import {serial} from './serial/serial.js';
@@ -25,6 +26,10 @@ import {lastval} from './lastval/lastval.js';
 import {like} from './like/like.js';
 import {isNull, isNotNull} from './is-null/is-null.js';
 import {inList} from './in-list/in-list.js';
+import {
+    identity,
+    identityByDefault,
+} from './identity/identity.js';
 
 export const clauses = {
     join,
@@ -45,6 +50,7 @@ export const clauses = {
     as,
     withNamed,
     createTable,
+    createSequence,
     column,
     autoIncrement,
     serial,
@@ -55,4 +61,6 @@ export const clauses = {
     isNull,
     isNotNull,
     inList,
+    identity,
+    identityByDefault,
 };

package/lib/printer/visitors/call-expression/clauses/create-sequence/create-sequence.js

@@ -0,0 +1,4 @@
+export const createSequence = (path, {write, traverse}) => {
+    write('CREATE SEQUENCE ');
+    traverse(path.get('arguments')[0]);
+};

package/lib/printer/visitors/call-expression/clauses/create-sequence/fixture/create-sequence-fix.sql

@@ -0,0 +1 @@
+CREATE SEQUENCE users_id_seq

package/lib/printer/visitors/call-expression/clauses/create-sequence/fixture/create-sequence.js

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

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/createTableIdentity-fix.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY)

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/createTableIdentity.js

@@ -0,0 +1,5 @@
+[
+    createTable(t, [
+        column(id, BIGINT, identity(), primaryKey()),
+    ]),
+];

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/createTableIdentityByDefault-fix.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY)

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/createTableIdentityByDefault.js

@@ -0,0 +1,5 @@
+[
+    createTable(t, [
+        column(id, BIGINT, identityByDefault(), primaryKey()),
+    ]),
+];

package/lib/printer/visitors/call-expression/clauses/identity/identity.js

@@ -0,0 +1,3 @@
+export const identity = (path, {write}) => write('GENERATED ALWAYS AS IDENTITY');
+
+export const identityByDefault = (path, {write}) => write('GENERATED BY DEFAULT AS IDENTITY');

package/lib/printer/visitors/call-expression/clauses/lastval/fixture/lastval-fix.sql

@@ -1,2 +1,2 @@
-SELECT LASTVAL()
+SELECT lastval()
 FROM users

package/lib/printer/visitors/call-expression/clauses/lastval/lastval.js

@@ -1 +1 @@
-export const lastval = (path, {write}) => write('LASTVAL()');
+export const lastval = (path, {write}) => write('lastval()');

package/lib/printer/visitors/fixture/binary-expression-fix.sql

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE x % 2

package/lib/printer/visitors/fixture/binary-expression.js

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(x % 2)),
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -26,6 +26,7 @@
     "#parser/clause/delete": "./lib/parser/visitors/clause/delete/delete.js",
     "#parser/clause/with-named": "./lib/parser/visitors/clause/with-named/with-named.js",
     "#parser/clause/create-table": "./lib/parser/visitors/clause/create-table/create-table.js",
+    "#parser/clause/create-sequence": "./lib/parser/visitors/clause/create-sequence/create-sequence.js",
     "#parser/clause/column-definition": "./lib/parser/visitors/clause/column-definition/column-definition.js",
     "#printer": "./lib/printer/printer.js",
     "#printer/test": "./test/create-printer-test.js"