@sqg/sqg 0.22.0 → 0.23.0

package/dist/index.mjs

@@ -2744,6 +2744,21 @@ var EnumType = class {
 		return `ENUM(${this.values.map((v) => `'${v}'`).join(", ")})`;
 	}
 };
+/**
+* Append a placeholder (`?`, `$1`, `$name`, or an inlined source) to the parts
+* rendered so far, keeping it separated from the preceding SQL text.
+*
+* Without the separator, `LIMIT ${n}` would render as `LIMIT$1` — which
+* Postgres lexes as the identifier `limit$1` and rejects. The whitespace is
+* added to the parts themselves so every rendering path (the joined `sql`
+* string and `sqlParts`, used by the template-literal renderers) agrees.
+*/
+function pushPlaceholder(parts, placeholder) {
+	const lastIndex = parts.length - 1;
+	const last = parts[lastIndex];
+	if (typeof last === "string" && /[A-Za-z0-9_$]$/.test(last)) parts[lastIndex] = `${last} `;
+	parts.push(placeholder);
+}
 var SQLQuery = class {
 	columns;
 	allColumns;
@@ -2926,23 +2941,13 @@ function parseSQLQueries(filePath, extraVariables) {
 					return this.sqlParts.filter((part) => typeof part !== "string" && !part.name.startsWith("sources_"));
 				}
 				toSqlWithAnonymousPlaceholders() {
-					let sql = "";
 					const sqlParts = [];
-					for (const part of this.sqlParts) if (typeof part === "string") {
-						sql += part;
-						sqlParts.push(part);
-					} else {
-						if (sql.length > 0) {
-							const last = sql[sql.length - 1];
-							if (last !== " " && last !== "=" && last !== ">" && last !== "<") sql += " ";
-						}
-						sql += "?";
-						if (part.name.startsWith("sources_")) sqlParts.push(part);
-						else sqlParts.push("?");
-					}
+					for (const part of this.sqlParts) if (typeof part === "string") sqlParts.push(part);
+					else if (part.name.startsWith("sources_")) pushPlaceholder(sqlParts, part);
+					else pushPlaceholder(sqlParts, "?");
 					return {
 						parameters: this.parameters(),
-						sql,
+						sql: sqlParts.map((part) => typeof part === "string" ? part : "?").join(""),
 						sqlParts
 					};
 				}
@@ -2953,7 +2958,7 @@ function parseSQLQueries(filePath, extraVariables) {
 					else {
 						const varName = part.name;
 						const value = part.value;
-						if (varName.startsWith("sources_")) sqlParts.push(part);
+						if (varName.startsWith("sources_")) pushPlaceholder(sqlParts, part);
 						else {
 							let pos = parameters.findIndex((p) => p.name === varName);
 							if (pos < 0) {
@@ -2963,7 +2968,7 @@ function parseSQLQueries(filePath, extraVariables) {
 								});
 								pos = parameters.length;
 							} else pos = pos + 1;
-							sqlParts.push(`$${pos}`);
+							pushPlaceholder(sqlParts, `$${pos}`);
 						}
 					}
 					return {
@@ -2975,8 +2980,8 @@ function parseSQLQueries(filePath, extraVariables) {
 				toSqlWithNamedPlaceholders() {
 					const sqlParts = [];
 					for (const part of this.sqlParts) if (typeof part === "string") sqlParts.push(part);
-					else if (part.name.startsWith("sources_")) sqlParts.push(part);
-					else sqlParts.push(`$${part.name}`);
+					else if (part.name.startsWith("sources_")) pushPlaceholder(sqlParts, part);
+					else pushPlaceholder(sqlParts, `$${part.name}`);
 					return {
 						parameters: this.parameters(),
 						sqlParts,
@@ -2999,8 +3004,9 @@ function parseSQLQueries(filePath, extraVariables) {
 						if (!varRef.startsWith("${") || !varRef.endsWith("}")) throw SqgError.inQuery(`Invalid variable reference: ${varRef}`, "SQL_PARSE_ERROR", name, filePath, { suggestion: "Variables should be in the format ${varName}" });
 						const varName = varRef.replace("${", "").replace("}", "");
 						const value = getVariable(varName);
-						if (to > from) sql.appendSql(content.slice(from, to));
+						if (from >= 0 && child.from > from) sql.appendSql(content.slice(from, child.from));
 						from = child.to;
+						to = child.to;
 						sql.appendVariable(varName, value);
 					} else {
 						if (from < 0) from = child.from;
@@ -3051,6 +3057,29 @@ function parseSQLQueries(filePath, extraVariables) {
 }
 //#endregion
 //#region src/db/types.ts
+/**
+* Whether an error is an integrity constraint violation (foreign key, unique,
+* check, not-null) rather than a problem with the statement itself.
+*/
+function isConstraintViolation(error) {
+	const message = error?.message ?? "";
+	const code = String(error?.code ?? "");
+	return code.startsWith("SQLITE_CONSTRAINT") || /^23/.test(code) || /^Constraint Error/i.test(message) || /violates .* constraint|constraint failed/i.test(message);
+}
+/**
+* Type introspection executes every EXEC statement against whatever data the
+* MIGRATE and TESTDATA blocks left behind, so a statement can fail purely
+* because a constraint has nothing to reference — a NOT NULL foreign key can
+* never be satisfied when no fixture created the parent row.
+*
+* Running an EXEC contributes nothing to the generated code (the prepared
+* statement already supplied the parameter types), so such a failure is
+* reported as a warning instead of aborting generation. Statements whose
+* result shape SQG needs (QUERY, including INSERT ... RETURNING) still fail.
+*/
+function warnConstraintViolation(query, error) {
+	consola.warn(`Skipped executing '${query.id}' in ${query.filename} during type introspection: ${error.message}\n  Introspection runs each statement against the TESTDATA fixtures only, so constraints such as foreign keys may not be satisfiable. Code generation is unaffected — add a TESTDATA block with the referenced rows to silence this warning.`);
+}
 async function initializeDatabase(queries, execQueries, reporter) {
 	const baselineQueries = queries.filter((q) => q.isBaseline && !q.sourceTarget);
 	for (const query of baselineQueries) try {
@@ -3198,6 +3227,10 @@ const duckdb = new class {
 			}
 			return await stmt.run();
 		} catch (error) {
+			if (!query.isQuery && isConstraintViolation(error)) {
+				warnConstraintViolation(query, error);
+				return;
+			}
 			consola.error(`Failed to execute query '${query.id}':`, error);
 			throw error;
 		}
@@ -3238,6 +3271,38 @@ const tempDatabaseName = "sqg-db-temp";
 const typeIdToName = /* @__PURE__ */ new Map();
 for (const [name, id] of Object.entries(types.builtins)) typeIdToName.set(Number(id), name);
 /**
+* Turn off referential integrity enforcement for the introspection connection.
+*
+* QUERY and EXEC statements are introspected against whatever data MIGRATE and
+* TESTDATA left behind, each in its own transaction, so a NOT NULL foreign key
+* can never be satisfied by a row an earlier statement inserted.
+* `session_replication_role = replica` disables the triggers enforcing it, for
+* this connection only, and every statement introspected here is rolled back.
+*
+* This happens after the database is initialized, so a foreign key violation in
+* a MIGRATE or TESTDATA block is still reported — those describe real data.
+*
+* Setting it needs superuser (or the SET privilege), so this is best effort:
+* without it, constraint violations on EXEC statements are still tolerated,
+* only INSERT ... RETURNING queries would fail.
+*/
+async function relaxConstraints(db, inTransaction) {
+	try {
+		if (inTransaction) {
+			await db.query("SAVEPOINT sqg_relax_constraints");
+			try {
+				await db.query("SET LOCAL session_replication_role = 'replica'");
+			} catch (e) {
+				await db.query("ROLLBACK TO SAVEPOINT sqg_relax_constraints");
+				throw e;
+			}
+			await db.query("RELEASE SAVEPOINT sqg_relax_constraints");
+		} else await db.query("SET session_replication_role = 'replica'");
+	} catch (e) {
+		consola.debug(`Could not disable constraint enforcement for introspection: ${e.message}`);
+	}
+}
+/**
 * External database mode: connects directly to the user's database.
 * Uses a single transaction for the entire session and rolls back on close,
 * so the database is never modified. Individual queries use savepoints.
@@ -3264,6 +3329,9 @@ var ExternalDbMode = class {
 			await db.query("ROLLBACK TO SAVEPOINT sqg_query");
 		}
 	}
+	relaxConstraints(db) {
+		return relaxConstraints(db, true);
+	}
 	async close(db) {
 		await db.query("ROLLBACK");
 		await db.end();
@@ -3313,6 +3381,9 @@ var TempDbMode = class {
 			await db.query("ROLLBACK");
 		}
 	}
+	relaxConstraints(db) {
+		return relaxConstraints(db, false);
+	}
 	async close(db) {
 		await db.end();
 		await this.dbInitial.query(`DROP DATABASE IF EXISTS "${tempDatabaseName}"`);
@@ -3408,6 +3479,7 @@ const postgres = new class {
 	async executeQueries(queries, reporter) {
 		const db = this.db;
 		if (!db) throw new DatabaseError("PostgreSQL database not initialized", "postgres", "This is an internal error. Check that migrations completed successfully.");
+		await this.mode.relaxConstraints(db);
 		try {
 			const executableQueries = queries.filter((q) => !q.skipGenerateFunction);
 			for (const query of executableQueries) {
@@ -3474,6 +3546,10 @@ const postgres = new class {
 			}
 			return result;
 		} catch (error) {
+			if (!query.isQuery && isConstraintViolation(error)) {
+				warnConstraintViolation(query, error);
+				return;
+			}
 			consola.error(`Failed to execute query '${query.id}':`, error);
 			throw error;
 		}
@@ -3526,6 +3602,7 @@ const sqlite = new class {
 	executeQueries(queries, reporter) {
 		const db = this.db;
 		if (!db) throw new DatabaseError("SQLite database not initialized", "sqlite", "This is an internal error. Migrations may have failed silently.");
+		db.pragma("foreign_keys = OFF");
 		try {
 			const executableQueries = queries.filter((q) => !q.skipGenerateFunction);
 			for (const query of executableQueries) {
@@ -3626,6 +3703,10 @@ const sqlite = new class {
 			}
 			return stmt.run(...params);
 		} catch (error) {
+			if (!query.isQuery && isConstraintViolation(error)) {
+				warnConstraintViolation(query, error);
+				return;
+			}
 			consola.error(`Failed to execute query '${query.id}' in ${query.filename}:\n ${statement.sql} \n ${statement.parameters.map((p) => p.value).join(", ")}`, error);
 			throw error;
 		}

package/dist/sqg.mjs

@@ -787,6 +787,21 @@ var EnumType = class {
 		return `ENUM(${this.values.map((v) => `'${v}'`).join(", ")})`;
 	}
 };
+/**
+* Append a placeholder (`?`, `$1`, `$name`, or an inlined source) to the parts
+* rendered so far, keeping it separated from the preceding SQL text.
+*
+* Without the separator, `LIMIT ${n}` would render as `LIMIT$1` — which
+* Postgres lexes as the identifier `limit$1` and rejects. The whitespace is
+* added to the parts themselves so every rendering path (the joined `sql`
+* string and `sqlParts`, used by the template-literal renderers) agrees.
+*/
+function pushPlaceholder(parts, placeholder) {
+	const lastIndex = parts.length - 1;
+	const last = parts[lastIndex];
+	if (typeof last === "string" && /[A-Za-z0-9_$]$/.test(last)) parts[lastIndex] = `${last} `;
+	parts.push(placeholder);
+}
 var SQLQuery = class {
 	columns;
 	allColumns;
@@ -969,23 +984,13 @@ function parseSQLQueries(filePath, extraVariables) {
 					return this.sqlParts.filter((part) => typeof part !== "string" && !part.name.startsWith("sources_"));
 				}
 				toSqlWithAnonymousPlaceholders() {
-					let sql = "";
 					const sqlParts = [];
-					for (const part of this.sqlParts) if (typeof part === "string") {
-						sql += part;
-						sqlParts.push(part);
-					} else {
-						if (sql.length > 0) {
-							const last = sql[sql.length - 1];
-							if (last !== " " && last !== "=" && last !== ">" && last !== "<") sql += " ";
-						}
-						sql += "?";
-						if (part.name.startsWith("sources_")) sqlParts.push(part);
-						else sqlParts.push("?");
-					}
+					for (const part of this.sqlParts) if (typeof part === "string") sqlParts.push(part);
+					else if (part.name.startsWith("sources_")) pushPlaceholder(sqlParts, part);
+					else pushPlaceholder(sqlParts, "?");
 					return {
 						parameters: this.parameters(),
-						sql,
+						sql: sqlParts.map((part) => typeof part === "string" ? part : "?").join(""),
 						sqlParts
 					};
 				}
@@ -996,7 +1001,7 @@ function parseSQLQueries(filePath, extraVariables) {
 					else {
 						const varName = part.name;
 						const value = part.value;
-						if (varName.startsWith("sources_")) sqlParts.push(part);
+						if (varName.startsWith("sources_")) pushPlaceholder(sqlParts, part);
 						else {
 							let pos = parameters.findIndex((p) => p.name === varName);
 							if (pos < 0) {
@@ -1006,7 +1011,7 @@ function parseSQLQueries(filePath, extraVariables) {
 								});
 								pos = parameters.length;
 							} else pos = pos + 1;
-							sqlParts.push(`$${pos}`);
+							pushPlaceholder(sqlParts, `$${pos}`);
 						}
 					}
 					return {
@@ -1018,8 +1023,8 @@ function parseSQLQueries(filePath, extraVariables) {
 				toSqlWithNamedPlaceholders() {
 					const sqlParts = [];
 					for (const part of this.sqlParts) if (typeof part === "string") sqlParts.push(part);
-					else if (part.name.startsWith("sources_")) sqlParts.push(part);
-					else sqlParts.push(`$${part.name}`);
+					else if (part.name.startsWith("sources_")) pushPlaceholder(sqlParts, part);
+					else pushPlaceholder(sqlParts, `$${part.name}`);
 					return {
 						parameters: this.parameters(),
 						sqlParts,
@@ -1042,8 +1047,9 @@ function parseSQLQueries(filePath, extraVariables) {
 						if (!varRef.startsWith("${") || !varRef.endsWith("}")) throw SqgError.inQuery(`Invalid variable reference: ${varRef}`, "SQL_PARSE_ERROR", name, filePath, { suggestion: "Variables should be in the format ${varName}" });
 						const varName = varRef.replace("${", "").replace("}", "");
 						const value = getVariable(varName);
-						if (to > from) sql.appendSql(content.slice(from, to));
+						if (from >= 0 && child.from > from) sql.appendSql(content.slice(from, child.from));
 						from = child.to;
+						to = child.to;
 						sql.appendVariable(varName, value);
 					} else {
 						if (from < 0) from = child.from;
@@ -1094,6 +1100,29 @@ function parseSQLQueries(filePath, extraVariables) {
 }
 //#endregion
 //#region src/db/types.ts
+/**
+* Whether an error is an integrity constraint violation (foreign key, unique,
+* check, not-null) rather than a problem with the statement itself.
+*/
+function isConstraintViolation(error) {
+	const message = error?.message ?? "";
+	const code = String(error?.code ?? "");
+	return code.startsWith("SQLITE_CONSTRAINT") || /^23/.test(code) || /^Constraint Error/i.test(message) || /violates .* constraint|constraint failed/i.test(message);
+}
+/**
+* Type introspection executes every EXEC statement against whatever data the
+* MIGRATE and TESTDATA blocks left behind, so a statement can fail purely
+* because a constraint has nothing to reference — a NOT NULL foreign key can
+* never be satisfied when no fixture created the parent row.
+*
+* Running an EXEC contributes nothing to the generated code (the prepared
+* statement already supplied the parameter types), so such a failure is
+* reported as a warning instead of aborting generation. Statements whose
+* result shape SQG needs (QUERY, including INSERT ... RETURNING) still fail.
+*/
+function warnConstraintViolation(query, error) {
+	consola.warn(`Skipped executing '${query.id}' in ${query.filename} during type introspection: ${error.message}\n  Introspection runs each statement against the TESTDATA fixtures only, so constraints such as foreign keys may not be satisfiable. Code generation is unaffected — add a TESTDATA block with the referenced rows to silence this warning.`);
+}
 async function initializeDatabase(queries, execQueries, reporter) {
 	const baselineQueries = queries.filter((q) => q.isBaseline && !q.sourceTarget);
 	for (const query of baselineQueries) try {
@@ -1241,6 +1270,10 @@ const duckdb = new class {
 			}
 			return await stmt.run();
 		} catch (error) {
+			if (!query.isQuery && isConstraintViolation(error)) {
+				warnConstraintViolation(query, error);
+				return;
+			}
 			consola.error(`Failed to execute query '${query.id}':`, error);
 			throw error;
 		}
@@ -1281,6 +1314,38 @@ const tempDatabaseName = "sqg-db-temp";
 const typeIdToName = /* @__PURE__ */ new Map();
 for (const [name, id] of Object.entries(types.builtins)) typeIdToName.set(Number(id), name);
 /**
+* Turn off referential integrity enforcement for the introspection connection.
+*
+* QUERY and EXEC statements are introspected against whatever data MIGRATE and
+* TESTDATA left behind, each in its own transaction, so a NOT NULL foreign key
+* can never be satisfied by a row an earlier statement inserted.
+* `session_replication_role = replica` disables the triggers enforcing it, for
+* this connection only, and every statement introspected here is rolled back.
+*
+* This happens after the database is initialized, so a foreign key violation in
+* a MIGRATE or TESTDATA block is still reported — those describe real data.
+*
+* Setting it needs superuser (or the SET privilege), so this is best effort:
+* without it, constraint violations on EXEC statements are still tolerated,
+* only INSERT ... RETURNING queries would fail.
+*/
+async function relaxConstraints(db, inTransaction) {
+	try {
+		if (inTransaction) {
+			await db.query("SAVEPOINT sqg_relax_constraints");
+			try {
+				await db.query("SET LOCAL session_replication_role = 'replica'");
+			} catch (e) {
+				await db.query("ROLLBACK TO SAVEPOINT sqg_relax_constraints");
+				throw e;
+			}
+			await db.query("RELEASE SAVEPOINT sqg_relax_constraints");
+		} else await db.query("SET session_replication_role = 'replica'");
+	} catch (e) {
+		consola.debug(`Could not disable constraint enforcement for introspection: ${e.message}`);
+	}
+}
+/**
 * External database mode: connects directly to the user's database.
 * Uses a single transaction for the entire session and rolls back on close,
 * so the database is never modified. Individual queries use savepoints.
@@ -1307,6 +1372,9 @@ var ExternalDbMode = class {
 			await db.query("ROLLBACK TO SAVEPOINT sqg_query");
 		}
 	}
+	relaxConstraints(db) {
+		return relaxConstraints(db, true);
+	}
 	async close(db) {
 		await db.query("ROLLBACK");
 		await db.end();
@@ -1356,6 +1424,9 @@ var TempDbMode = class {
 			await db.query("ROLLBACK");
 		}
 	}
+	relaxConstraints(db) {
+		return relaxConstraints(db, false);
+	}
 	async close(db) {
 		await db.end();
 		await this.dbInitial.query(`DROP DATABASE IF EXISTS "${tempDatabaseName}"`);
@@ -1451,6 +1522,7 @@ const postgres = new class {
 	async executeQueries(queries, reporter) {
 		const db = this.db;
 		if (!db) throw new DatabaseError("PostgreSQL database not initialized", "postgres", "This is an internal error. Check that migrations completed successfully.");
+		await this.mode.relaxConstraints(db);
 		try {
 			const executableQueries = queries.filter((q) => !q.skipGenerateFunction);
 			for (const query of executableQueries) {
@@ -1517,6 +1589,10 @@ const postgres = new class {
 			}
 			return result;
 		} catch (error) {
+			if (!query.isQuery && isConstraintViolation(error)) {
+				warnConstraintViolation(query, error);
+				return;
+			}
 			consola.error(`Failed to execute query '${query.id}':`, error);
 			throw error;
 		}
@@ -1569,6 +1645,7 @@ const sqlite = new class {
 	executeQueries(queries, reporter) {
 		const db = this.db;
 		if (!db) throw new DatabaseError("SQLite database not initialized", "sqlite", "This is an internal error. Migrations may have failed silently.");
+		db.pragma("foreign_keys = OFF");
 		try {
 			const executableQueries = queries.filter((q) => !q.skipGenerateFunction);
 			for (const query of executableQueries) {
@@ -1669,6 +1746,10 @@ const sqlite = new class {
 			}
 			return stmt.run(...params);
 		} catch (error) {
+			if (!query.isQuery && isConstraintViolation(error)) {
+				warnConstraintViolation(query, error);
+				return;
+			}
 			consola.error(`Failed to execute query '${query.id}' in ${query.filename}:\n ${statement.sql} \n ${statement.parameters.map((p) => p.value).join(", ")}`, error);
 			throw error;
 		}
@@ -3964,7 +4045,7 @@ async function processProject(projectPath, ui) {
 //#region src/mcp-server.ts
 const server = new Server({
 	name: "sqg-mcp",
-	version: process.env.npm_package_version ?? "0.22.0"
+	version: process.env.npm_package_version ?? "0.23.0"
 }, { capabilities: {
 	tools: {},
 	resources: {}
@@ -4435,7 +4516,7 @@ function formatMs(ms) {
 }
 //#endregion
 //#region src/sqg.ts
-const version = process.env.npm_package_version ?? "0.22.0";
+const version = process.env.npm_package_version ?? "0.23.0";
 updateNotifier({ pkg: {
 	name: "@sqg/sqg",
 	version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqg/sqg",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "SQG - SQL Query Generator - Type-safe code generation from SQL (https://sqg.dev)",
   "type": "module",
   "main": "dist/index.mjs",