tina4-nodejs 3.13.139 → 3.13.140

package/packages/cli/dist/bin.js

@@ -3575,14 +3575,72 @@ var init_cachedDatabase = __esm({
   }
 });
 
+// ../orm/src/adapters/sqlCrud.ts
+function buildInsertRow(dialect, table2, data, suffix = "", options = {}) {
+  const keys = Object.keys(data);
+  const sql = buildInsert(dialect, table2, keys, suffix, options.startAt ?? 1);
+  return { sql, values: Object.values(data) };
+}
+function buildInsertRows(dialect, table2, rows) {
+  if (rows.length === 0) return null;
+  const keys = Object.keys(rows[0]);
+  const sql = buildInsert(dialect, table2, keys);
+  const paramsList = rows.map((row) => keys.map((k) => row[k]));
+  return { sql, paramsList };
+}
+function buildUpdate(dialect, table2, data, filter, params, options = {}) {
+  const startAt = options.startAt ?? 1;
+  const convertFragment = options.convertFragment ?? identityFragment;
+  const dataKeys = Object.keys(data);
+  const setClauses = buildSetClause(dialect, dataKeys, startAt);
+  const whereStart = startAt + dataKeys.length;
+  if (typeof filter === "string") {
+    const where = filter ? ` WHERE ${convertFragment(filter, whereStart)}` : "";
+    return {
+      sql: `UPDATE ${dialect.quote(table2)} SET ${setClauses}${where}`,
+      values: [...Object.values(data), ...params ?? []]
+    };
+  }
+  const whereClauses = buildWhereClause(dialect, Object.keys(filter), whereStart);
+  return {
+    sql: `UPDATE ${dialect.quote(table2)} SET ${setClauses} WHERE ${whereClauses}`,
+    values: [...Object.values(data), ...Object.values(filter)]
+  };
+}
+function buildDelete(dialect, table2, filter, params, options = {}) {
+  const startAt = options.startAt ?? 1;
+  const convertFragment = options.convertFragment ?? identityFragment;
+  if (typeof filter === "string") {
+    const where = filter ? ` WHERE ${convertFragment(filter, startAt)}` : "";
+    return {
+      sql: `DELETE FROM ${dialect.quote(table2)}${where}`,
+      values: params ?? []
+    };
+  }
+  const whereClauses = buildWhereClause(dialect, Object.keys(filter), startAt);
+  return {
+    sql: `DELETE FROM ${dialect.quote(table2)} WHERE ${whereClauses}`,
+    values: Object.values(filter)
+  };
+}
+var identityFragment;
+var init_sqlCrud = __esm({
+  "../orm/src/adapters/sqlCrud.ts"() {
+    "use strict";
+    init_sqlDialect();
+    identityFragment = (fragment) => fragment;
+  }
+});
+
 // ../orm/src/adapters/sqlite.ts
 var sqlite_exports = {};
 __export(sqlite_exports, {
-  SQLiteAdapter: () => SQLiteAdapter
+  SQLiteAdapter: () => SQLiteAdapter,
+  resolveSqlitePath: () => resolveSqlitePath
 });
 import { DatabaseSync } from "node:sqlite";
 import { mkdirSync as mkdirSync3 } from "node:fs";
-import { dirname as dirname4, isAbsolute as isAbsolute2, join as join5, resolve as resolve3 } from "node:path";
+import { dirname as dirname4, isAbsolute as isAbsolute2, join as join5, resolve as resolve3, sep } from "node:path";
 function isIdentifier(str) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(str);
 }
@@ -3613,17 +3671,20 @@ function sqliteVersionAtLeast(major, minor, patch2) {
 }
 function resolveSqlitePath(dbPath) {
   if (dbPath === ":memory:") return dbPath;
-  let path10 = dbPath;
-  if (!isAbsolute2(path10)) {
-    path10 = join5(process.cwd(), path10);
-    mkdirSync3(dirname4(path10), { recursive: true });
-  } else {
-    const cwd = resolve3(process.cwd());
-    const abs = resolve3(path10);
-    if (abs.startsWith(cwd + "/") || abs === cwd) {
-      mkdirSync3(dirname4(abs), { recursive: true });
-    }
+  const isWindowsAbs = /^[A-Za-z]:[\\/]/.test(dbPath);
+  if (isAbsolute2(dbPath) || isWindowsAbs) {
+    return dbPath;
+  }
+  const cwd = resolve3(process.cwd());
+  const path10 = join5(cwd, dbPath);
+  const parent = dirname4(path10);
+  const absParent = resolve3(parent);
+  if (absParent !== cwd && !absParent.startsWith(cwd + sep)) {
+    throw new Error(
+      `SQLite path "${dbPath}" resolves outside the project directory: "${absParent}" is not within "${cwd}". Tina4 refuses to create directories outside the project (ADR-0086). Use an absolute path for a database that lives outside the project.`
+    );
   }
+  mkdirSync3(parent, { recursive: true, mode: 509 });
   return path10;
 }
 function fieldTypeToSQLite(def) {
@@ -3659,6 +3720,7 @@ var init_sqlite = __esm({
   "../orm/src/adapters/sqlite.ts"() {
     "use strict";
     init_sqlDialect();
+    init_sqlCrud();
     init_sqlTranslator();
     _sqliteVersionInfo = null;
     SQLiteAdapter = class {
@@ -3779,16 +3841,12 @@ var init_sqlite = __esm({
       }
       insert(table2, data) {
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, affectedRows: 0 };
-          const keys2 = Object.keys(data[0]);
-          const sql2 = buildInsert(ANSI_DIALECT, table2, keys2);
-          const paramsList = data.map((row) => keys2.map((k) => row[k]));
-          const result = this.executeMany(sql2, paramsList);
+          const batch = buildInsertRows(ANSI_DIALECT, table2, data);
+          if (!batch) return { success: true, affectedRows: 0 };
+          const result = this.executeMany(batch.sql, batch.paramsList);
           return { success: true, affectedRows: result.affectedRows, lastId: result.lastId };
         }
-        const keys = Object.keys(data);
-        const sql = buildInsert(ANSI_DIALECT, table2, keys);
-        const values = Object.values(data);
+        const { sql, values } = buildInsertRow(ANSI_DIALECT, table2, data);
         try {
           const result = this.db.prepare(sql).run(...toSqlParams(values));
           this._lastInsertId = result.lastInsertRowid;
@@ -3798,21 +3856,7 @@ var init_sqlite = __esm({
         }
       }
       update(table2, data, filter, params) {
-        const setClauses = buildSetClause(ANSI_DIALECT, Object.keys(data));
-        if (typeof filter === "string") {
-          const where = filter ? ` WHERE ${filter}` : "";
-          const sql2 = `UPDATE ${ANSI_DIALECT.quote(table2)} SET ${setClauses}${where}`;
-          const values2 = [...Object.values(data), ...params ?? []];
-          try {
-            const result = this.db.prepare(sql2).run(...toSqlParams(values2));
-            return { success: true, affectedRows: Number(result.changes) };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const whereClauses = buildWhereClause(ANSI_DIALECT, Object.keys(filter));
-        const sql = `UPDATE ${ANSI_DIALECT.quote(table2)} SET ${setClauses} WHERE ${whereClauses}`;
-        const values = [...Object.values(data), ...Object.values(filter)];
+        const { sql, values } = buildUpdate(ANSI_DIALECT, table2, data, filter, params);
         try {
           const result = this.db.prepare(sql).run(...toSqlParams(values));
           return { success: true, affectedRows: Number(result.changes) };
@@ -3829,18 +3873,7 @@ var init_sqlite = __esm({
           }
           return { success: true, affectedRows: totalAffected };
         }
-        if (typeof filter === "string") {
-          const sql2 = filter ? `DELETE FROM "${table2}" WHERE ${filter}` : `DELETE FROM "${table2}"`;
-          try {
-            const result = this.db.prepare(sql2).run(...toSqlParams(params ?? []));
-            return { success: true, affectedRows: Number(result.changes) };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const whereClauses = buildWhereClause(ANSI_DIALECT, Object.keys(filter));
-        const sql = `DELETE FROM ${ANSI_DIALECT.quote(table2)} WHERE ${whereClauses}`;
-        const values = Object.values(filter);
+        const { sql, values } = buildDelete(ANSI_DIALECT, table2, filter, params);
         try {
           const result = this.db.prepare(sql).run(...toSqlParams(values));
           return { success: true, affectedRows: Number(result.changes) };
@@ -4132,6 +4165,7 @@ var init_postgres = __esm({
   "../orm/src/adapters/postgres.ts"() {
     "use strict";
     init_sqlDialect();
+    init_sqlCrud();
     init_sqlTranslator();
     init_connectTimeout();
     pg = null;
@@ -4333,21 +4367,17 @@ var init_postgres = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, affectedRows: 0 };
-          const keys2 = Object.keys(data[0]);
-          const sql2 = buildInsert(ANSI_DIALECT, table2, keys2);
-          const paramsList = data.map((row) => keys2.map((k) => row[k]));
+          const batch = buildInsertRows(ANSI_DIALECT, table2, data);
+          if (!batch) return { success: true, affectedRows: 0 };
           try {
-            const result = await this.executeManyAsync(sql2, paramsList);
+            const result = await this.executeManyAsync(batch.sql, batch.paramsList);
             if (result.lastId !== void 0) this._lastInsertId = result.lastId;
             return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
           } catch (e) {
             return { success: false, affectedRows: 0, error: e.message };
           }
         }
-        const keys = Object.keys(data);
-        const sql = buildInsert(POSTGRES_DIALECT, table2, keys, " RETURNING *");
-        const values = Object.values(data);
+        const { sql, values } = buildInsertRow(POSTGRES_DIALECT, table2, data, " RETURNING *");
         try {
           const result = await this.client.query(sql, values);
           const insertedRow = result.rows[0];
@@ -4367,26 +4397,10 @@ var init_postgres = __esm({
       }
       async updateAsync(table2, data, filter, params) {
         this.ensureConnected();
-        const dataKeys = Object.keys(data);
-        let paramIndex = 1;
-        const setClauses = buildSetClause(POSTGRES_DIALECT, dataKeys, paramIndex);
-        paramIndex += dataKeys.length;
-        if (typeof filter === "string") {
-          const where = filter ? ` WHERE ${this.convertPlaceholders(filter, paramIndex)}` : "";
-          const sql2 = `UPDATE ${POSTGRES_DIALECT.quote(table2)} SET ${setClauses}${where}`;
-          const values2 = [...Object.values(data), ...params ?? []];
-          try {
-            const result = await this.client.query(sql2, values2);
-            return { success: true, affectedRows: result.rowCount ?? 0 };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const filterKeys = Object.keys(filter);
-        const whereClauses = buildWhereClause(POSTGRES_DIALECT, filterKeys, paramIndex);
-        paramIndex += filterKeys.length;
-        const sql = `UPDATE ${POSTGRES_DIALECT.quote(table2)} SET ${setClauses} WHERE ${whereClauses}`;
-        const values = [...Object.values(data), ...Object.values(filter)];
+        const { sql, values } = buildUpdate(POSTGRES_DIALECT, table2, data, filter, params, {
+          startAt: 1,
+          convertFragment: (fragment, startAt) => this.convertPlaceholders(fragment, startAt)
+        });
         try {
           const result = await this.client.query(sql, values);
           return { success: true, affectedRows: result.rowCount ?? 0 };
@@ -4399,21 +4413,10 @@ var init_postgres = __esm({
       }
       async deleteAsync(table2, filter, params) {
         this.ensureConnected();
-        if (typeof filter === "string") {
-          const sql2 = filter ? `DELETE FROM "${table2}" WHERE ${this.bindable(filter, params)}` : `DELETE FROM "${table2}"`;
-          try {
-            const result = await this.client.query(sql2, params ?? []);
-            return { success: true, affectedRows: result.rowCount ?? 0 };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const filterKeys = Object.keys(filter);
-        let paramIndex = 1;
-        const whereClauses = buildWhereClause(POSTGRES_DIALECT, filterKeys, paramIndex);
-        paramIndex += filterKeys.length;
-        const sql = `DELETE FROM ${POSTGRES_DIALECT.quote(table2)} WHERE ${whereClauses}`;
-        const values = Object.values(filter);
+        const { sql, values } = buildDelete(POSTGRES_DIALECT, table2, filter, params, {
+          startAt: 1,
+          convertFragment: (fragment) => this.bindable(fragment, params)
+        });
         try {
           const result = await this.client.query(sql, values);
           return { success: true, affectedRows: result.rowCount ?? 0 };
@@ -4587,6 +4590,7 @@ var init_mysql = __esm({
   "../orm/src/adapters/mysql.ts"() {
     "use strict";
     init_sqlDialect();
+    init_sqlCrud();
     init_sqlTranslator();
     init_connectTimeout();
     mysql2 = null;
@@ -4768,21 +4772,17 @@ var init_mysql = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, affectedRows: 0 };
-          const keys2 = Object.keys(data[0]);
-          const sql2 = buildInsert(MYSQL_DIALECT, table2, keys2);
-          const paramsList = data.map((row) => keys2.map((k) => row[k]));
+          const batch = buildInsertRows(MYSQL_DIALECT, table2, data);
+          if (!batch) return { success: true, affectedRows: 0 };
           try {
-            const result = await this.executeManyAsync(sql2, paramsList);
+            const result = await this.executeManyAsync(batch.sql, batch.paramsList);
             if (result.lastId !== void 0) this._lastInsertId = result.lastId;
             return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
           } catch (e) {
             return { success: false, affectedRows: 0, error: e.message };
           }
         }
-        const keys = Object.keys(data);
-        const sql = buildInsert(MYSQL_DIALECT, table2, keys);
-        const values = Object.values(data);
+        const { sql, values } = buildInsertRow(MYSQL_DIALECT, table2, data);
         try {
           const result = await this.queryPromise(sql, values);
           this._lastInsertId = result.insertId ?? null;
@@ -4800,21 +4800,7 @@ var init_mysql = __esm({
       }
       async updateAsync(table2, data, filter, params) {
         this.ensureConnected();
-        const setClauses = buildSetClause(MYSQL_DIALECT, Object.keys(data));
-        if (typeof filter === "string") {
-          const where = filter ? ` WHERE ${filter}` : "";
-          const sql2 = `UPDATE ${MYSQL_DIALECT.quote(table2)} SET ${setClauses}${where}`;
-          const values2 = [...Object.values(data), ...params ?? []];
-          try {
-            const result = await this.queryPromise(sql2, values2);
-            return { success: true, affectedRows: result.affectedRows ?? 0 };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const whereClauses = buildWhereClause(MYSQL_DIALECT, Object.keys(filter));
-        const sql = `UPDATE ${MYSQL_DIALECT.quote(table2)} SET ${setClauses} WHERE ${whereClauses}`;
-        const values = [...Object.values(data), ...Object.values(filter)];
+        const { sql, values } = buildUpdate(MYSQL_DIALECT, table2, data, filter, params);
         try {
           const result = await this.queryPromise(sql, values);
           return { success: true, affectedRows: result.affectedRows ?? 0 };
@@ -4827,18 +4813,7 @@ var init_mysql = __esm({
       }
       async deleteAsync(table2, filter, params) {
         this.ensureConnected();
-        if (typeof filter === "string") {
-          const sql2 = filter ? `DELETE FROM \`${table2}\` WHERE ${filter}` : `DELETE FROM \`${table2}\``;
-          try {
-            const result = await this.queryPromise(sql2, params ?? []);
-            return { success: true, affectedRows: result.affectedRows ?? 0 };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const whereClauses = buildWhereClause(MYSQL_DIALECT, Object.keys(filter));
-        const sql = `DELETE FROM ${MYSQL_DIALECT.quote(table2)} WHERE ${whereClauses}`;
-        const values = Object.values(filter);
+        const { sql, values } = buildDelete(MYSQL_DIALECT, table2, filter, params);
         try {
           const result = await this.queryPromise(sql, values);
           return { success: true, affectedRows: result.affectedRows ?? 0 };
@@ -4990,6 +4965,7 @@ var init_mssql = __esm({
   "../orm/src/adapters/mssql.ts"() {
     "use strict";
     init_sqlDialect();
+    init_sqlCrud();
     init_sqlTranslator();
     init_connectTimeout();
     tedious = null;
@@ -5246,21 +5222,17 @@ var init_mssql = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, affectedRows: 0 };
-          const keys2 = Object.keys(data[0]);
-          const sql2 = buildInsert({ quote: MSSQL_DIALECT.quote, marker: ANSI_DIALECT.marker }, table2, keys2);
-          const paramsList = data.map((row) => keys2.map((k) => row[k]));
+          const batch = buildInsertRows({ quote: MSSQL_DIALECT.quote, marker: ANSI_DIALECT.marker }, table2, data);
+          if (!batch) return { success: true, affectedRows: 0 };
           try {
-            const result = await this.executeManyAsync(sql2, paramsList);
+            const result = await this.executeManyAsync(batch.sql, batch.paramsList);
             if (result.lastId !== void 0) this._lastInsertId = result.lastId;
             return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
           } catch (e) {
             return { success: false, affectedRows: 0, error: e.message };
           }
         }
-        const keys = Object.keys(data);
-        const sql = buildInsert(MSSQL_DIALECT, table2, keys, "; SELECT SCOPE_IDENTITY() AS id", 0);
-        const values = Object.values(data);
+        const { sql, values } = buildInsertRow(MSSQL_DIALECT, table2, data, "; SELECT SCOPE_IDENTITY() AS id", { startAt: 0 });
         try {
           const result = await this.execSqlPromise(sql, values);
           const id = result.rows[0]?.id ?? null;
@@ -5283,26 +5255,10 @@ var init_mssql = __esm({
       }
       async updateAsync(table2, data, filter, params) {
         this.ensureConnected();
-        const dataKeys = Object.keys(data);
-        let paramIndex = 0;
-        const setClauses = buildSetClause(MSSQL_DIALECT, dataKeys, paramIndex);
-        paramIndex += dataKeys.length;
-        if (typeof filter === "string") {
-          const where = filter ? ` WHERE ${this.convertPlaceholders(filter, paramIndex)}` : "";
-          const sql2 = `UPDATE ${MSSQL_DIALECT.quote(table2)} SET ${setClauses}${where}`;
-          const values2 = [...Object.values(data), ...params ?? []];
-          try {
-            const result = await this.execSqlPromise(sql2, values2);
-            return { success: true, affectedRows: result.rowCount };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const filterKeys = Object.keys(filter);
-        const whereClauses = buildWhereClause(MSSQL_DIALECT, filterKeys, paramIndex);
-        paramIndex += filterKeys.length;
-        const sql = `UPDATE ${MSSQL_DIALECT.quote(table2)} SET ${setClauses} WHERE ${whereClauses}`;
-        const values = [...Object.values(data), ...Object.values(filter)];
+        const { sql, values } = buildUpdate(MSSQL_DIALECT, table2, data, filter, params, {
+          startAt: 0,
+          convertFragment: (fragment, startAt) => this.convertPlaceholders(fragment, startAt)
+        });
         try {
           const result = await this.execSqlPromise(sql, values);
           return { success: true, affectedRows: result.rowCount };
@@ -5315,21 +5271,10 @@ var init_mssql = __esm({
       }
       async deleteAsync(table2, filter, params) {
         this.ensureConnected();
-        if (typeof filter === "string") {
-          const sql2 = filter ? `DELETE FROM [${table2}] WHERE ${this.bindable(filter, params)}` : `DELETE FROM [${table2}]`;
-          try {
-            const result = await this.execSqlPromise(sql2, params ?? []);
-            return { success: true, affectedRows: result.rowCount };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const filterKeys = Object.keys(filter);
-        let paramIndex = 0;
-        const whereClauses = buildWhereClause(MSSQL_DIALECT, filterKeys, paramIndex);
-        paramIndex += filterKeys.length;
-        const sql = `DELETE FROM ${MSSQL_DIALECT.quote(table2)} WHERE ${whereClauses}`;
-        const values = Object.values(filter);
+        const { sql, values } = buildDelete(MSSQL_DIALECT, table2, filter, params, {
+          startAt: 0,
+          convertFragment: (fragment) => this.bindable(fragment, params)
+        });
         try {
           const result = await this.execSqlPromise(sql, values);
           return { success: true, affectedRows: result.rowCount };
@@ -5582,6 +5527,7 @@ var init_firebird = __esm({
   "../orm/src/adapters/firebird.ts"() {
     "use strict";
     init_sqlDialect();
+    init_sqlCrud();
     init_sqlTranslator();
     init_connectTimeout();
     firebird = null;
@@ -5952,17 +5898,13 @@ var init_firebird = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, affectedRows: 0 };
-          const keys2 = Object.keys(data[0]);
-          const sql2 = buildInsert(FB_DIALECT, table2, keys2);
-          const paramsList = data.map((row) => keys2.map((k) => row[k]));
-          const result = await this.executeManyAsync(sql2, paramsList);
+          const batch = buildInsertRows(FB_DIALECT, table2, data);
+          if (!batch) return { success: true, affectedRows: 0 };
+          const result = await this.executeManyAsync(batch.sql, batch.paramsList);
           const lastId2 = await this.readGeneratorId(table2) ?? result.lastId;
           return { success: true, affectedRows: result.totalAffected, lastId: lastId2 ?? void 0 };
         }
-        const keys = Object.keys(data);
-        const sql = buildInsert(FB_DIALECT, table2, keys);
-        const values = Object.values(data);
+        const { sql, values } = buildInsertRow(FB_DIALECT, table2, data);
         await this.executePromise(sql, values);
         const lastId = await this.readGeneratorId(table2);
         return { success: true, affectedRows: 1, lastId: lastId ?? void 0 };
@@ -5972,18 +5914,7 @@ var init_firebird = __esm({
       }
       async updateAsync(table2, data, filter, params) {
         this.ensureConnected();
-        const setClauses = buildSetClause(FB_DIALECT, Object.keys(data));
-        if (typeof filter === "string") {
-          const where = filter ? ` WHERE ${filter}` : "";
-          const affected2 = await this.executeReturningCount(
-            `UPDATE ${fbQuote(table2)} SET ${setClauses}${where}`,
-            [...Object.values(data), ...params ?? []]
-          );
-          return { success: true, affectedRows: affected2 };
-        }
-        const whereClauses = buildWhereClause(FB_DIALECT, Object.keys(filter));
-        const sql = `UPDATE ${FB_DIALECT.quote(table2)} SET ${setClauses} WHERE ${whereClauses}`;
-        const values = [...Object.values(data), ...Object.values(filter)];
+        const { sql, values } = buildUpdate(FB_DIALECT, table2, data, filter, params);
         const affected = await this.executeReturningCount(sql, values);
         return { success: true, affectedRows: affected };
       }
@@ -5992,14 +5923,7 @@ var init_firebird = __esm({
       }
       async deleteAsync(table2, filter, params) {
         this.ensureConnected();
-        if (typeof filter === "string") {
-          const where = filter ? ` WHERE ${filter}` : "";
-          const affected2 = await this.executeReturningCount(`DELETE FROM ${fbQuote(table2)}${where}`, params ?? []);
-          return { success: true, affectedRows: affected2 };
-        }
-        const whereClauses = buildWhereClause(FB_DIALECT, Object.keys(filter));
-        const sql = `DELETE FROM ${FB_DIALECT.quote(table2)} WHERE ${whereClauses}`;
-        const values = Object.values(filter);
+        const { sql, values } = buildDelete(FB_DIALECT, table2, filter, params);
         const affected = await this.executeReturningCount(sql, values);
         return { success: true, affectedRows: affected };
       }
@@ -6831,6 +6755,7 @@ var init_odbc = __esm({
   "../orm/src/adapters/odbc.ts"() {
     "use strict";
     init_sqlDialect();
+    init_sqlCrud();
     init_sqlTranslator();
     init_connectTimeout();
     odbcModule = null;
@@ -7030,16 +6955,12 @@ var init_odbc = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, affectedRows: 0 };
-          const keys2 = Object.keys(data[0]);
-          const sql2 = buildInsert(ANSI_DIALECT, table2, keys2);
-          const paramsList = data.map((row) => keys2.map((k) => row[k]));
-          const { totalAffected } = await this.executeManyAsync(sql2, paramsList);
+          const batch = buildInsertRows(ANSI_DIALECT, table2, data);
+          if (!batch) return { success: true, affectedRows: 0 };
+          const { totalAffected } = await this.executeManyAsync(batch.sql, batch.paramsList);
           return { success: true, affectedRows: totalAffected };
         }
-        const keys = Object.keys(data);
-        const sql = buildInsert(ANSI_DIALECT, table2, keys);
-        const values = Object.values(data);
+        const { sql, values } = buildInsertRow(ANSI_DIALECT, table2, data);
         try {
           const result = await this.connection.query(sql, values);
           return { success: true, affectedRows: this.affectedCount(result), lastId: this._lastInsertId ?? void 0 };
@@ -7050,17 +6971,7 @@ var init_odbc = __esm({
       /** Update rows in a table matching filter. */
       async updateAsync(table2, data, filter, params) {
         this.ensureConnected();
-        const setClauses = buildSetClause(ANSI_DIALECT, Object.keys(data));
-        let whereSql;
-        let values;
-        if (typeof filter === "string") {
-          whereSql = filter;
-          values = [...Object.values(data), ...params ?? []];
-        } else {
-          whereSql = buildWhereClause(ANSI_DIALECT, Object.keys(filter));
-          values = [...Object.values(data), ...Object.values(filter)];
-        }
-        const sql = `UPDATE ${ANSI_DIALECT.quote(table2)} SET ${setClauses} WHERE ${whereSql}`;
+        const { sql, values } = buildUpdate(ANSI_DIALECT, table2, data, filter, params);
         try {
           const result = await this.connection.query(sql, values);
           return { success: true, affectedRows: this.affectedCount(result) };
@@ -7079,18 +6990,7 @@ var init_odbc = __esm({
           }
           return { success: true, affectedRows: totalAffected };
         }
-        if (typeof filter === "string") {
-          const sql2 = filter ? `DELETE FROM "${table2}" WHERE ${filter}` : `DELETE FROM "${table2}"`;
-          try {
-            const result = await this.connection.query(sql2, params ?? []);
-            return { success: true, affectedRows: this.affectedCount(result) };
-          } catch (e) {
-            return { success: false, affectedRows: 0, error: e.message };
-          }
-        }
-        const whereClauses = buildWhereClause(ANSI_DIALECT, Object.keys(filter));
-        const sql = `DELETE FROM ${ANSI_DIALECT.quote(table2)} WHERE ${whereClauses}`;
-        const values = Object.values(filter);
+        const { sql, values } = buildDelete(ANSI_DIALECT, table2, filter, params);
         try {
           const result = await this.connection.query(sql, values);
           return { success: true, affectedRows: this.affectedCount(result) };
@@ -14501,7 +14401,7 @@ var init_attachment = __esm({
 // ../orm/src/realtime/storage.ts
 import { randomBytes as randomBytes3 } from "node:crypto";
 import { mkdirSync as mkdirSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, statSync as statSync4 } from "node:fs";
-import { resolve as resolve6, sep } from "node:path";
+import { resolve as resolve6, sep as sep2 } from "node:path";
 import { createRequire as createRequire6 } from "node:module";
 function loadAwsSdk(packageName) {
   try {
@@ -14554,7 +14454,7 @@ var init_storage = __esm({
       // Resolve inside the root and reject any traversal attempt.
       pathFor(key) {
         const target = resolve6(this.directory, key);
-        if (target !== this.directory && !target.startsWith(this.directory + sep)) {
+        if (target !== this.directory && !target.startsWith(this.directory + sep2)) {
           throw new Error(`unsafe storage key: ${JSON.stringify(key)}`);
         }
         return target;
@@ -15071,6 +14971,7 @@ __export(src_exports, {
   resolveDbPool: () => resolveDbPool,
   resolveFirebirdCharset: () => resolveFirebirdCharset,
   resolveGraphConnectTimeout: () => resolveGraphConnectTimeout,
+  resolveSqlitePath: () => resolveSqlitePath,
   rollback: () => rollback,
   seedModels: () => seedModels,
   seedOrm: () => seedOrm,
@@ -17545,7 +17446,7 @@ __export(engine_exports, {
 });
 import { createHash as createHash3, createHmac as createHmac3, randomBytes as randomBytes4 } from "node:crypto";
 import { readFileSync as readFileSync6, existsSync as existsSync8, statSync as statSync6, realpathSync } from "node:fs";
-import { join as join11, resolve as resolve7, isAbsolute as isAbsolute4, sep as sep2 } from "node:path";
+import { join as join11, resolve as resolve7, isAbsolute as isAbsolute4, sep as sep3 } from "node:path";
 function jsonText(value) {
   try {
     const text = JSON.stringify(value);
@@ -17886,15 +17787,15 @@ function findOutsideQuotes(expr, needle) {
   }
   return -1;
 }
-function splitOutsideQuotes(expr, sep8) {
-  if (!expr.includes(sep8)) return [expr];
+function splitOutsideQuotes(expr, sep9) {
+  if (!expr.includes(sep9)) return [expr];
   const parts = [];
   let currentStart = 0;
   let inQuote = null;
   let depth = 0;
   let bracketDepth = 0;
   let i = 0;
-  const sepLen = sep8.length;
+  const sepLen = sep9.length;
   const lastStart = expr.length - sepLen;
   while (i <= lastStart) {
     const ch = expr[i];
@@ -17915,7 +17816,7 @@ function splitOutsideQuotes(expr, sep8) {
     else if (ch === ")") depth--;
     else if (ch === "[") bracketDepth++;
     else if (ch === "]") bracketDepth--;
-    if (depth === 0 && bracketDepth === 0 && expr.startsWith(sep8, i)) {
+    if (depth === 0 && bracketDepth === 0 && expr.startsWith(sep9, i)) {
       parts.push(expr.slice(currentStart, i));
       i += sepLen;
       currentStart = i;
@@ -18868,8 +18769,8 @@ var init_engine = __esm({
       },
       first: (v) => Array.isArray(v) ? v[0] ?? null : null,
       last: (v) => Array.isArray(v) ? v[v.length - 1] ?? null : null,
-      join: (v, sep8) => Array.isArray(v) ? v.map(String).join(sep8 !== void 0 ? String(sep8) : ", ") : String(v),
-      split: (v, sep8) => String(v).split(sep8 !== void 0 ? String(sep8) : " "),
+      join: (v, sep9) => Array.isArray(v) ? v.map(String).join(sep9 !== void 0 ? String(sep9) : ", ") : String(v),
+      split: (v, sep9) => String(v).split(sep9 !== void 0 ? String(sep9) : " "),
       replace: (v, from, to) => {
         const s = String(v);
         if (from !== void 0 && typeof from === "object" && from !== null && !Array.isArray(from)) {
@@ -19273,7 +19174,7 @@ var init_engine = __esm({
         }
         const root = realpathSync(this.templateDir);
         const real = realpathSync(filePath);
-        if (real !== root && !real.startsWith(root + sep2)) {
+        if (real !== root && !real.startsWith(root + sep3)) {
           throw new Error(`Template path escapes the templates directory: ${name}`);
         }
         return readFileSync6(real, "utf-8");
@@ -24663,7 +24564,7 @@ var init_dispatchPipeline = __esm({
 
 // ../core/src/static.ts
 import { readFileSync as readFileSync9, realpathSync as realpathSync3, statSync as statSync8 } from "node:fs";
-import { join as join16, extname as extname3, sep as sep3 } from "node:path";
+import { join as join16, extname as extname3, sep as sep4 } from "node:path";
 import { gzipSync as gzipSync2 } from "node:zlib";
 function isCompressible(contentType) {
   return COMPRESSIBLE_PREFIXES2.some((prefix) => contentType.includes(prefix));
@@ -24694,8 +24595,8 @@ function tryServeStatic(staticDir, req2, res) {
     }
     const stat = statSync8(realPath);
     if (!stat.isFile()) continue;
-    if (realPath !== realDir && !realPath.startsWith(realDir + sep3)) continue;
-    if (hasHiddenSegment(realPath.slice(realDir.length + 1), sep3)) continue;
+    if (realPath !== realDir && !realPath.startsWith(realDir + sep4)) continue;
+    if (hasHiddenSegment(realPath.slice(realDir.length + 1), sep4)) continue;
     const ext = extname3(realPath);
     const contentType = MIME_TYPES[ext] ?? "application/octet-stream";
     const etag = `W/"${stat.size}-${Math.floor(stat.mtimeMs / 1e3)}"`;
@@ -25678,7 +25579,7 @@ __export(generate_exports, {
   toTableName: () => toTableName
 });
 import { existsSync as existsSync16, mkdirSync as mkdirSync13, writeFileSync as writeFileSync10 } from "node:fs";
-import { join as join21, relative as relative2, resolve as resolve11, sep as sep4 } from "node:path";
+import { join as join21, relative as relative2, resolve as resolve11, sep as sep5 } from "node:path";
 function ensureDir(dir) {
   if (__resolution.dryRun) return;
   if (!existsSync16(dir)) {
@@ -25804,7 +25705,7 @@ function toRelPath(absPath) {
   const cwd = process.cwd();
   const rel = relative2(cwd, absPath);
   if (!rel) return absPath;
-  return sep4 === "/" ? rel : rel.split(sep4).join("/");
+  return sep5 === "/" ? rel : rel.split(sep5).join("/");
 }
 function captureEditHints(absPath, content) {
   if (!/\.(ts|tsx|js|mjs|cjs|jsx|sql|twig|html\.twig)$/.test(absPath)) return;
@@ -25876,12 +25777,6 @@ function printResolution() {
   lines.push("");
   process.stderr.write(lines.join("\n"));
 }
-function toPlural(name) {
-  const lower = name.toLowerCase();
-  if (lower.endsWith("s")) return lower;
-  if (lower.endsWith("y") && !/[aeiou]y$/i.test(lower)) return lower.slice(0, -1) + "ies";
-  return lower + "s";
-}
 function toCamel(name) {
   return name.charAt(0).toLowerCase() + name.slice(1);
 }
@@ -26314,7 +26209,7 @@ ${aiFill(`delete_${singular}`, {
 }
 function generateCrud(name, flags) {
   const table2 = resolveTable(name, flags, { announce: false });
-  const routeName = toPlural(table2);
+  const routeName = pluralizeReserved(toSnake(name));
   const isPublic = Boolean(flags.public);
   if (!__resolution.jsonMode) console.log(`
   Generating CRUD for ${name}...
@@ -26568,7 +26463,7 @@ void test${titleName};
 function generateForm(name, flags) {
   const fields = fieldsOrDefault(flags.fields || "");
   const table2 = resolveTable(name, flags, { announce: false });
-  const routeName = toPlural(table2);
+  const routeName = pluralizeReserved(toSnake(name));
   const inputTypes = {
     string: "text",
     str: "text",
@@ -26634,7 +26529,7 @@ function generateForm(name, flags) {
 function generateView(name, flags) {
   const fields = fieldsOrDefault(flags.fields || "");
   const table2 = resolveTable(name, flags, { announce: false });
-  const routeName = toPlural(table2);
+  const routeName = pluralizeReserved(toSnake(name));
   const cols = fields.map(([f]) => f);
   const dir = resolve11("src/templates/pages");
   ensureDir(dir);
@@ -27646,7 +27541,7 @@ var init_generate = __esm({
       crud: ({ name, table: table2 }) => [
         `Apply the migration:   npx tina4nodejs migrate`,
         `Serve and try:         npx tina4nodejs serve  ->  visit /swagger`,
-        `Run the gate test:     npx tsx tests/${toPlural(table2)}.test.ts`,
+        `Run the gate test:     npx tsx tests/${pluralizeReserved(toSnake(name))}.test.ts`,
         `Change fields: edit src/models/${name}.ts then re-run generate crud`
       ],
       migration: () => [
@@ -27664,10 +27559,10 @@ var init_generate = __esm({
       ],
       form: ({ name, table: table2 }) => [
         `Render from a route:  res.render("forms/${table2}.twig", { item })`,
-        `Add the POST route:   npx tina4nodejs generate route ${toPlural(table2)} --model ${name}`
+        `Add the POST route:   npx tina4nodejs generate route ${pluralizeReserved(toSnake(name))} --model ${name}`
       ],
-      view: ({ table: table2 }) => [
-        `Wire routes to render list -> ${toPlural(table2)}.twig, detail -> ${table2}.twig`,
+      view: ({ name, table: table2 }) => [
+        `Wire routes to render list -> ${pluralizeReserved(toSnake(name))}.twig, detail -> ${table2}.twig`,
         `Customize the templates in src/templates/pages/`
       ],
       auth: () => [
@@ -36021,7 +35916,7 @@ ${end}
 // ../core/src/devAdmin.ts
 import { cpus as osCpus } from "node:os";
 import { readFileSync as readFileSync20, writeFileSync as writeFileSync16, existsSync as existsSync23, readdirSync as readdirSync15, mkdirSync as mkdirSync19, copyFileSync as copyFileSync2, statSync as statSync17, openSync as openSync4, closeSync as closeSync4, fstatSync as fstatSync2, fchmodSync as fchmodSync2, ftruncateSync, constants as constants3, realpathSync as realpathSync6, lstatSync } from "node:fs";
-import { join as join28, dirname as dirname13, resolve as resolve17, relative as relative9, sep as sep7, basename as basename6 } from "node:path";
+import { join as join28, dirname as dirname13, resolve as resolve17, relative as relative9, sep as sep8, basename as basename6 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { timingSafeEqual as timingSafeEqual2 } from "node:crypto";
 function escapeHtml(value) {
@@ -36412,7 +36307,7 @@ function safeJoin(projectRoot3, rel, extraRoots = []) {
     const resolved = realPathOf(resolve17(root, rel));
     const roots = [root, ...extraRoots.filter(Boolean).map((r) => realPathOf(resolve17(r)))];
     for (const r of roots) {
-      if (resolved === r || resolved.startsWith(r.endsWith(sep7) ? r : r + sep7)) return resolved;
+      if (resolved === r || resolved.startsWith(r.endsWith(sep8) ? r : r + sep8)) return resolved;
     }
   } catch {
   }
@@ -39951,8 +39846,8 @@ function writeMcpDiscovery(projectRoot3, port) {
     const lines = contents.split(/\r?\n/);
     const already = lines.some((l) => l.trim() === GITIGNORE_LINE || l.trim() === ".tina4");
     if (!already) {
-      const sep8 = contents.endsWith("\n") || contents === "" ? "" : "\n";
-      fs9.writeFileSync(gitignorePath, `${contents}${sep8}${GITIGNORE_LINE}
+      const sep9 = contents.endsWith("\n") || contents === "" ? "" : "\n";
+      fs9.writeFileSync(gitignorePath, `${contents}${sep9}${GITIGNORE_LINE}
 `, "utf-8");
     }
   }