qubu 0.7.2 → 0.7.3

package/dist/introspection/sqlite.mjs

@@ -159,7 +159,7 @@ async function readCatalog(connection, options) {
 			else mappedConstraints.push(index);
 		}
 		const foreignRows = await query(connection, sqliteForeignKeyQuery, [tableName, options.namespace], options, diagnostics, `foreign-key:${tableName}`);
-		for (const value of foreignKeys(currentTable, foreignRows, tableByName, options.namespace, diagnostics)) if (value.kind === "opaque-object") opaqueObjects.push(value);
+		for (const value of foreignKeys(currentTable, foreignRows, sqlText, tableByName, options.namespace, diagnostics)) if (value.kind === "opaque-object") opaqueObjects.push(value);
 		else mappedConstraints.push(value);
 		currentTable.indexes = mappedIndexes;
 		currentTable.constraints = mappedConstraints;
@@ -968,15 +968,94 @@ function mapIndex(table, row, infoRows, sqlText, namespace, diagnostics, opaqueO
 		reference: reference("index", physicalName, namespace, "sqlite_schema", "name")
 	};
 }
+function constraintDefinitions(sqlText) {
+	if (!sqlText) return [];
+	const tokens = sqlText.match(/--[^\n]*(?:\n|$)|\/\*[\s\S]*?\*\/|'(?:[^']|'')*'|"(?:[^"]|"")*"|`(?:[^`]|``)*`|\[[^\]]*\]|[A-Za-z_][A-Za-z0-9_$]*|[^\s]/g) ?? [];
+	const definitions = [];
+	let depth = 0;
+	let current = [];
+	for (const token of tokens) {
+		if (token.startsWith("--") || token.startsWith("/*")) continue;
+		if (token === "(") {
+			if (depth++ === 0) continue;
+		} else if (token === ")") {
+			if (--depth === 0) {
+				definitions.push(current);
+				break;
+			}
+		}
+		if (depth === 1 && token === ",") {
+			definitions.push(current);
+			current = [];
+		} else if (depth > 0) current.push(token);
+	}
+	return definitions;
+}
+function constraintColumns(tokens, start) {
+	if (tokens[start] !== "(") return;
+	const columns = [];
+	for (let index = start + 1; index < tokens.length; index += 2) {
+		const name = unquoteIdentifier(tokens[index]);
+		if (name === void 0) return;
+		columns.push(name);
+		if (tokens[index + 1] === ")") return columns;
+		if (tokens[index + 1] !== ",") return;
+	}
+}
+function sameColumns(left, right) {
+	return left !== void 0 && left.length === right.length && left.every((name, index) => name === right[index]);
+}
 function declaredConstraintName(sqlText, keyword, columns) {
-	if (!sqlText) return void 0;
-	const pattern = new RegExp(`CONSTRAINT\\s+("(?:[^"]|"")*"|\`[^\`]*\`|\\[[^\\]]*\\]|[A-Za-z_][A-Za-z0-9_\$]*)\\s+${keyword}\\s*\\(([^)]*)\\)`, "gi");
-	for (const match of sqlText.matchAll(pattern)) {
-		const found = (match[2] ?? "").split(",").map((value) => unquoteIdentifier(value.trim())).filter((value) => value !== void 0);
-		if (found.length === columns.length && found.every((value, index) => value === columns[index])) return unquoteIdentifier(match[1]);
+	const words = keyword === "UNIQUE" ? ["UNIQUE"] : ["PRIMARY", "KEY"];
+	const names = [];
+	for (const tokens of constraintDefinitions(sqlText)) for (let index = 0; index < tokens.length; index++) {
+		if (tokens[index]?.toUpperCase() !== "CONSTRAINT" || !words.every((word, offset) => tokens[index + 2 + offset]?.toUpperCase() === word)) continue;
+		const start = index + 2 + words.length;
+		const found = tokens[start] === "(" ? constraintColumns(tokens, start) : index > 0 ? [unquoteIdentifier(tokens[0])].filter((name) => name !== void 0) : void 0;
+		const name = unquoteIdentifier(tokens[index + 1]);
+		if (name !== void 0 && sameColumns(found, columns)) names.push(name);
 	}
+	return names.length === 1 ? names[0] : void 0;
 }
-function foreignKeys(table, rows, tables, namespace, diagnostics) {
+function declaredForeignKeyName(sqlText, rows) {
+	const names = [];
+	const first = rows[0];
+	for (const tokens of constraintDefinitions(sqlText)) for (let index = 0; index < tokens.length; index++) {
+		const named = tokens[index]?.toUpperCase() === "CONSTRAINT";
+		const unnamedTable = index === 0 && tokens[index]?.toUpperCase() === "FOREIGN";
+		const unnamedColumn = index > 0 && tokens[index]?.toUpperCase() === "REFERENCES" && tokens[index - 2]?.toUpperCase() !== "CONSTRAINT";
+		if (!named && !unnamedTable && !unnamedColumn) continue;
+		const name = named ? unquoteIdentifier(tokens[index + 1]) : void 0;
+		let cursor = named ? index + 2 : index;
+		let source;
+		if (tokens[cursor]?.toUpperCase() === "FOREIGN" && tokens[cursor + 1]?.toUpperCase() === "KEY") {
+			source = constraintColumns(tokens, cursor + 2);
+			if (!source) continue;
+			cursor += 3 + source.length * 2;
+		} else if (index > 0) {
+			const column = unquoteIdentifier(tokens[0]);
+			source = column === void 0 ? void 0 : [column];
+		}
+		if (tokens[cursor]?.toUpperCase() !== "REFERENCES" || !sameColumns(source, rows.map((row) => text(row.source_column))) || unquoteIdentifier(tokens[cursor + 1]) !== text(first.target_table)) continue;
+		cursor += 2;
+		const target = constraintColumns(tokens, cursor);
+		if (target) cursor += 1 + target.length * 2;
+		if (target ? !sameColumns(target, rows.map((row) => text(row.target_column))) : rows.some((row) => text(row.target_column) !== void 0)) continue;
+		let onUpdate = "no-action";
+		let onDelete = "no-action";
+		for (; cursor < tokens.length; cursor++) {
+			if (tokens[cursor]?.toUpperCase() !== "ON") continue;
+			const clause = tokens[cursor + 1]?.toUpperCase();
+			const verb = tokens[cursor + 2]?.toUpperCase();
+			const value = verb === "NO" || verb === "SET" ? `${verb} ${tokens[cursor + 3]}` : verb;
+			if (clause === "UPDATE") onUpdate = action(value) ?? "no-action";
+			if (clause === "DELETE") onDelete = action(value) ?? "no-action";
+		}
+		if (onUpdate === (action(first.on_update) ?? "no-action") && onDelete === (action(first.on_delete) ?? "no-action")) names.push(name);
+	}
+	return names.length === 1 ? names[0] : void 0;
+}
+function foreignKeys(table, rows, sqlText, tables, namespace, diagnostics) {
 	const grouped = /* @__PURE__ */ new Map();
 	for (const row of rows) {
 		const id = text(row.id) ?? "0";
@@ -987,7 +1066,8 @@ function foreignKeys(table, rows, tables, namespace, diagnostics) {
 	return [...grouped.entries()].map(([key, group]) => {
 		const ordered = [...group].sort((left, right) => (number(left.seq) ?? 0) - (number(right.seq) ?? 0));
 		const first = ordered[0];
-		const physicalName = `foreign_key_${table.physicalName}_${key}`;
+		const declaredName = declaredForeignKeyName(sqlText, ordered);
+		const physicalName = declaredName ?? `foreign_key_${table.physicalName}_${key}`;
 		const targetTableName = text(first.target_table);
 		const targetTable = targetTableName === void 0 ? void 0 : tables.get(targetTableName);
 		const targetColumns = ordered.map((row) => text(row.target_column));
@@ -1026,7 +1106,7 @@ function foreignKeys(table, rows, tables, namespace, diagnostics) {
 		return {
 			kind: "foreign-key",
 			id: stableId(physicalName),
-			identitySource: "deterministic-fallback",
+			identitySource: declaredName ? "physical-name" : "deterministic-fallback",
 			physicalName,
 			columns: sourceColumns,
 			target: {

package/dist/postgres.d.mts

@@ -4,7 +4,7 @@ import { Ad as MetadataOf, Dr as UpdateFromClause, Gu as ExpressionWithOutput, K
  * PostgreSQL's only core rendering difference is positional parameters. PostgreSQL-specific
  * expressions and clauses should remain separate modules.
  */
-declare function postgresDialect(): Dialect<"json" | "ilike" | "on-conflict" | "row-locking" | "update-from">;
+declare function postgresDialect(): Dialect<"on-conflict" | "json" | "ilike" | "row-locking" | "update-from">;
 /** PostgreSQL's case-insensitive pattern-match operator. */
 declare function ilike<TLeft extends ExpressionWithOutput<string>, R extends Operand<string>>(left: TLeft & ComparisonValidation<TLeft, R, "ILIKE">, pattern: R): SchemaExpression<ResultMeta<boolean, ((MetadataOf<TLeft & SqlCapabilityValidation<(MetadataOf<TLeft> extends (infer T) ? T extends MetadataOf<TLeft> ? T extends {
   readonly kind: "result";

package/dist/sqlite.d.mts

@@ -27,6 +27,6 @@ type SqliteTimestampColumn<TOptions extends SqliteTimestampOptions = {}> = Colum
 }>;
 /** Declare a SQLite `INTEGER` timestamp with a live Date codec. */
 declare function sqliteTimestamp<const TOptions extends SqliteTimestampOptions = {}>(options?: TOptions): SqliteTimestampColumn<TOptions>;
-declare function sqliteDialect(): Dialect<"json" | "on-conflict">;
+declare function sqliteDialect(): Dialect<"on-conflict" | "json">;
 //#endregion
 export { type ConflictAction, type ConflictTarget, type DoNothingAction, type DoUpdateAction, type ExcludedSource, type OnConflictClause, SqliteTimestampColumn, SqliteTimestampMode, SqliteTimestampOptions, doNothing, doUpdate, excluded, onConflict, sqliteDialect, sqliteTimestamp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qubu",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/aleclarson/qubu"