biz-a-cli 2.3.80-15357 → 2.3.80-15359

package/engine/orm/executeBlock.js

@@ -521,8 +521,7 @@ const coerceOne = (table, column, value, dbIndex) => {
 };
 
 /* `INSERT INTO t (a, b) VALUES (x, y)` — positional, so a column/value count mismatch means the
-   alignment cannot be trusted and nothing is touched. An `INSERT … SELECT` has no list to align to
-   and is left alone by construction. */
+   alignment cannot be trusted and nothing is touched. */
 const INSERT_VALUES = /^(INSERT\s+INTO\s+([\w$."]+)\s*\(([^)]*)\)\s*VALUES\s*\()([\s\S]*)(\)\s*)$/i;
 const coerceInsert = (statement, dbIndex) => {
 	const match = INSERT_VALUES.exec(statement.trim());
@@ -534,6 +533,52 @@ const coerceInsert = (statement, dbIndex) => {
 	return head + values.map((v, i) => coerceOne(table, columns[i], v, dbIndex)).join(",") + tail;
 };
 
+/*
+ * `INSERT INTO t (a, b) SELECT <literals> [WHERE …]` — the guarded-insert idiom.
+ *
+ * ⚠️⚠️ THIS FORM WAS LEFT ALONE ON PURPOSE AND THAT WAS WRONG. The note here used to read "an
+ * `INSERT … SELECT` has no list to align to", which is true of a SELECT reading a real table and
+ * false of the shape applications actually write:
+ *
+ *   INSERT INTO ST_ITEM_CATEGORY (ID, CODE, NAME, ACTIVE, …)
+ *   SELECT '{…}', 'makanan', 'makanan', 1, NULL, NULL
+ *   WHERE NOT EXISTS (SELECT 1 FROM ST_ITEM_CATEGORY WHERE ID = '{…}')
+ *
+ * That select list IS a fixed tuple aligned to the column list — which `stampAuthorshipLiterals`
+ * below had already concluded, and has been relying on for months, **on these very statements**.
+ * The two halves of this module simply disagreed about whether the form was safe to align, and QA
+ * found the disagreement: `column "active" is of type boolean but expression is of type integer`.
+ *
+ * ⚠️ THE SAFETY CONDITION IS BORROWED VERBATIM from that function, because it is the part that
+ * matters: nothing may read from a real table (no top-level FROM, once the translator has stripped
+ * Firebird's `FROM RDB$DATABASE`), and the tuple must split to exactly the column count. Outside
+ * those two conditions the alignment is a guess, and a wrong guess quotes somebody else's value.
+ */
+const INSERT_SELECT = /^INSERT\s+INTO\s+([\w$."]+)\s*\(([^)]*)\)\s*(SELECT\s[\s\S]*)$/i;
+const coerceInsertSelect = (statement, dbIndex) => {
+	const match = INSERT_SELECT.exec(statement.trim());
+	if (!match) return statement;
+	const [, table, columnText, rest] = match;
+
+	/* ⚠️ Reading a real table means the select list is expressions, not a tuple. */
+	if (topLevelIndexOf(rest, "FROM") !== -1) return statement;
+
+	const whereAt = topLevelIndexOf(rest, "WHERE");
+	const selectList = whereAt === -1 ? rest.slice("SELECT".length) : rest.slice("SELECT".length, whereAt);
+	/* whereAt points AT the keyword, so the separating space belongs to the tail. */
+	const tail = whereAt === -1 ? "" : " " + rest.slice(whereAt);
+
+	const columns = columnText.split(",").map((c) => c.trim().replace(/^"|"$/g, ""));
+	const values = splitValueList(selectList);
+	if (columns.length !== values.length) return statement;
+
+	return (
+		"INSERT INTO " + table + " (" + columnText + ") SELECT" +
+		values.map((v, i) => coerceOne(table, columns[i], v, dbIndex)).join(",") +
+		tail
+	);
+};
+
 /* `UPDATE t SET a = x, b = y [WHERE …]` — ASSIGNMENTS ONLY. The WHERE clause is a filter, handled
    where filters are built; rewriting it here too risks corrupting a comparison meant literally. */
 const UPDATE_SET = /^(UPDATE\s+([\w$."]+)\s+SET\s+)([\s\S]*?)(\s+WHERE[\s\S]*)?$/i;
@@ -687,7 +732,12 @@ const coerceBooleanLiterals = (statement, dbIndex) => {
 	if (/^\s*INSERT\s/i.test(statement)) {
 		/* ⚠️ Booleans FIRST, then the stamps. Coercion aligns values to the ORIGINAL column list, so
 		   appending first would shift every value one place and quote the wrong one. */
-		return stampAuthorshipLiterals(coerceInsert(statement, dbIndex), dbIndex);
+		/* ⚠️ Both INSERT shapes, then the stamps. Coercion aligns values to the ORIGINAL column
+		   list, so appending the stamp columns first would shift every value one place. */
+		return stampAuthorshipLiterals(
+			coerceInsertSelect(coerceInsert(statement, dbIndex), dbIndex),
+			dbIndex,
+		);
 	}
 	if (/^\s*UPDATE\s/i.test(statement)) return coerceUpdate(statement, dbIndex);
 	return statement;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "biz-a-cli",
-	"version": "2.3.80-15357",
+	"version": "2.3.80-15359",
 	"description": "",
 	"main": "bin/index.js",
 	"type": "module",