happy-sql 1.5.3 → 1.7.0

package/ChangeLog

@@ -1,3 +1,20 @@
+2026.08.18, v1.7.0
+
+feature:
+- 9446e52 happy-sql: nextval
+- 60be73e nextval
+
+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:

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

@@ -11,21 +11,41 @@ const getDataType = (dataType) => {
 
 const isSerial = (dataType) => getDataType(dataType).name === 'SERIAL';
 
+const convertGenerated = (constraint) => {
+    const kws = [];
+    
+    for (const kw of constraint.generatedKw)
+        kws.push(kw.name);
+    
+    if (kws.includes('DEFAULT'))
+        return callExpression(identifier('identityByDefault'), []);
+    
+    return callExpression(identifier('identity'), []);
+};
+
+const convertDefault = ({expr}) => {
+    if (expr.type !== 'func_call' || expr.name.name !== 'nextval')
+        return null;
+    
+    const seqName = expr.args.expr.args.items[0].value;
+    
+    return callExpression(identifier('nextval'), [
+        identifier(seqName),
+    ]);
+};
+
+const CONSTRAINT_VISITORS = {
+    constraint_primary_key: () => callExpression(identifier('primaryKey'), []),
+    constraint_generated: convertGenerated,
+    constraint_not_null: () => null,
+    constraint_default: convertDefault,
+};
+
 const convertConstraint = (constraint) => {
-    if (constraint.type === 'constraint_primary_key')
-        return callExpression(identifier('primaryKey'), []);
+    const visitor = CONSTRAINT_VISITORS[constraint.type];
     
-    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'), []);
-    }
+    if (visitor)
+        return visitor(constraint);
     
     return callExpression(identifier('autoIncrement'), []);
 };
@@ -46,8 +66,12 @@ export const convertColumnDefinition = (column) => {
     else
         args.push(identifier(getDataType(dataType).text));
     
-    for (const constraint of constraints)
-        args.push(convertConstraint(constraint));
+    for (const constraint of constraints) {
+        const node = convertConstraint(constraint);
+        
+        if (node)
+            args.push(node);
+    }
     
     return callExpression(identifier('column'), args);
 };

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,3 @@
+[
+    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-default-fix.js

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

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

@@ -0,0 +1 @@
+CREATE TABLE t (id INTEGER DEFAULT 42 PRIMARY KEY)

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

@@ -0,0 +1,6 @@
+[
+    createTable(users, [
+        column(id, INTEGER, nextval(users_id_seq), primaryKey()),
+        column(name, TEXT),
+    ]),
+];

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

@@ -0,0 +1 @@
+CREATE TABLE users (id INTEGER DEFAULT nextval('users_id_seq') PRIMARY KEY, name TEXT)

package/lib/parser/visitors/clause/create-table/fixture/create-table-not-null-fix.js

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

package/lib/parser/visitors/clause/create-table/fixture/create-table-not-null.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id INTEGER NOT NULL PRIMARY KEY)

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/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,12 +16,14 @@ 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';
 import {primaryKey} from './primary-key/primary-key.js';
 import {lastInsertRowid} from './last-insert-rowid/last-insert-rowid.js';
 import {lastval} from './lastval/lastval.js';
+import {nextval} from './nextval/nextval.js';
 import {like} from './like/like.js';
 import {isNull, isNotNull} from './is-null/is-null.js';
 import {inList} from './in-list/in-list.js';
@@ -49,12 +51,14 @@ export const clauses = {
     as,
     withNamed,
     createTable,
+    createSequence,
     column,
     autoIncrement,
     serial,
     primaryKey,
     lastInsertRowid,
     lastval,
+    nextval,
     like,
     isNull,
     isNotNull,

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/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/call-expression/clauses/nextval/fixture/nextval-fix.sql

@@ -0,0 +1 @@
+CREATE TABLE users (id INTEGER DEFAULT nextval('users_id_seq') PRIMARY KEY, name TEXT)

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

@@ -0,0 +1,6 @@
+[
+    createTable(users, [
+        column(id, INTEGER, nextval(users_id_seq), primaryKey()),
+        column(name, TEXT),
+    ]),
+];

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

@@ -0,0 +1,4 @@
+export const nextval = (path, {write}) => {
+    const [seq] = path.node.arguments;
+    write(`DEFAULT nextval('${seq.name}')`);
+};

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.3",
+  "version": "1.7.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"

package/lib/printer/visitors/call-expression/clauses/count/fixture/count-fix.js

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