happy-sql 1.6.0 → 1.7.1

package/ChangeLog

@@ -1,3 +1,14 @@
+2026.08.19, v1.7.1
+
+fix:
+- 269dea4 happy-sql: values printer: preserve string param quotes
+
+2026.08.18, v1.7.0
+
+feature:
+- 9446e52 happy-sql: nextval
+- 60be73e nextval
+
 2026.08.15, v1.6.0
 
 fix:

package/lib/parser/fixture/with-named-insert-fix.js

@@ -0,0 +1,11 @@
+[
+    withNamed(call = insert(into(
+        CallExpression,
+        [file, parent_id],
+        values(':file', ':parent_id'),
+    ), returning(id)), member = insert(into(
+        MemberExpression,
+        [file, parent_id],
+        select(':file', id, from(call)),
+    ), returning(id)), insert(into(Identifier, [file, name, parent_id], select(':file', 'isNaN', id, from(member))))),
+];

package/lib/parser/fixture/with-named-insert.sql

@@ -0,0 +1,13 @@
+WITH
+    call AS (
+        INSERT INTO CallExpression (file, parent_id)
+        VALUES (':file', ':parent_id')
+        RETURNING id
+    ),
+    member AS (
+        INSERT INTO MemberExpression (file, parent_id)
+        SELECT ':file', id FROM call
+        RETURNING id
+    )
+INSERT INTO Identifier (file, name, parent_id)
+SELECT ':file', 'isNaN', id FROM member

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/fixture/create-sequence-fix.js

@@ -1,4 +1,3 @@
 [
     createSequence(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/printer/visitors/call-expression/clauses/clauses.js

@@ -23,6 +23,7 @@ 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';
@@ -57,6 +58,7 @@ export const clauses = {
     primaryKey,
     lastInsertRowid,
     lastval,
+    nextval,
     like,
     isNull,
     isNotNull,

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

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (:x)
+INSERT INTO t (x) VALUES (':x')

package/lib/printer/visitors/call-expression/clauses/into/fixture/single-column-fix.sql

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (:x)
+INSERT INTO t (x) VALUES (':x')

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

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (:x) ON CONFLICT (x) DO UPDATE SET x = :x
+INSERT INTO t (x) VALUES (':x') ON CONFLICT (x) DO UPDATE SET x = :x

package/lib/printer/visitors/call-expression/clauses/on-conflict/fixture/on-conflict-multi-fix.sql

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (:x) ON CONFLICT (x, y) DO UPDATE SET x = :x
+INSERT INTO t (x) VALUES (':x') ON CONFLICT (x, y) DO UPDATE SET x = :x

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

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (:x) ON CONFLICT (x) DO UPDATE SET y = :y RETURNING id
+INSERT INTO t (x) VALUES (':x') ON CONFLICT (x) DO UPDATE SET y = :y RETURNING id

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

@@ -1 +1 @@
-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/printer/visitors/call-expression/clauses/returning/fixture/returning-id-fix.sql

@@ -1 +1 @@
-INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id
+INSERT INTO CallExpression (parent_id) VALUES (':parent_id') RETURNING id

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

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (:x) RETURNING id, created_at
+INSERT INTO t (x) VALUES (':x') RETURNING id, created_at

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

@@ -1 +1 @@
-VALUES (:x)
+VALUES (':x')

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

@@ -0,0 +1 @@
+VALUES (':file', ':parent_id')

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

@@ -0,0 +1 @@
+[values(':file', ':parent_id')]

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

@@ -1,3 +1,7 @@
+import {types} from '@putout/babel';
+
+const {isStringLiteral} = types;
+
 export const values = (path, {write, traverse}) => {
     const args = path.get('arguments');
     write('VALUES (');
@@ -5,7 +9,12 @@ export const values = (path, {write, traverse}) => {
         if (i > 0)
             write(', ');
         
-        traverse(args[i]);
+        const arg = args[i];
+        
+        if (isStringLiteral(arg.node))
+            write(`'${arg.node.value}'`);
+        else
+            traverse(arg);
     }
     
     write(')');

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/with-named-insert-fix.sql

@@ -0,0 +1,10 @@
+WITH
+    call AS (
+        INSERT INTO CallExpression (file, parent_id) VALUES (':file', ':parent_id') RETURNING id
+    ),
+    member AS (
+        INSERT INTO MemberExpression (file, parent_id) SELECT :file, id
+FROM call RETURNING id
+    )
+INSERT INTO Identifier (file, name, parent_id) SELECT :file, 'isNaN', id
+FROM member

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/with-named-insert.js

@@ -0,0 +1,11 @@
+[
+    withNamed(call = insert(into(
+        CallExpression,
+        [file, parent_id],
+        values(':file', ':parent_id'),
+    ), returning(id)), member = insert(into(
+        MemberExpression,
+        [file, parent_id],
+        select(':file', id, from(call)),
+    ), returning(id)), insert(into(Identifier, [file, name, parent_id], select(':file', 'isNaN', id, from(member))))),
+];

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/withNamed-fix.sql

@@ -1,6 +1,6 @@
 WITH
     call AS (
-        INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id
+        INSERT INTO CallExpression (parent_id) VALUES (':parent_id') RETURNING id
     ),
     member AS (
         INSERT INTO MemberExpression (parent_id) SELECT id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {

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

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