@happyvertical/smrt-core 0.43.6 → 0.43.8

package/dist/migrations/differ.js

@@ -318,7 +318,7 @@ var SchemaComparer = class {
 			diff.added_tables.push(schema);
 			diff.has_changes = true;
 		} else {
-			const tableChanges = await this.compareTable(tableName, schema);
+			const tableChanges = await this.compareTable(tableName, schema, manifestSchemas);
 			if (tableChanges.length > 0) {
 				diff.changes.push(...tableChanges);
 				if (tableChanges.some((change) => !isInfoOnlyChange(change))) diff.has_changes = true;
@@ -340,7 +340,7 @@ var SchemaComparer = class {
 	/**
 	* Compare a single table's schema to manifest
 	*/
-	async compareTable(tableName, manifest) {
+	async compareTable(tableName, manifest, manifestSchemas = {}) {
 		const changes = [];
 		const dbSchema = await this.db.getTableSchema?.(tableName);
 		if (!dbSchema) return changes;
@@ -354,10 +354,10 @@ var SchemaComparer = class {
 		const dbIndexPredicates = await this.getDbIndexPredicates(tableName);
 		const indexChanges = this.compareIndexes(tableName, manifest, dbSchema, dbIndexPredicates);
 		changes.push(...indexChanges);
-		changes.push(...await this.compareForeignKeys(tableName, manifest, dbSchema));
+		changes.push(...await this.compareForeignKeys(tableName, manifest, dbSchema, manifestSchemas));
 		return changes;
 	}
-	async compareForeignKeys(tableName, manifest, dbSchema) {
+	async compareForeignKeys(tableName, manifest, dbSchema, manifestSchemas) {
 		const changes = [];
 		const liveForeignKeys = dbSchema.foreignKeys || [];
 		const declaredForeignKeys = schemaForeignKeys(manifest);
@@ -392,8 +392,18 @@ var SchemaComparer = class {
 			const expectedDelete = foreignKey.onDelete === void 0 ? "NO ACTION" : requireForeignKeyAction(foreignKey.onDelete, `${tableName}.${foreignKey.column} ON DELETE`);
 			const expectedUpdate = foreignKey.onUpdate === void 0 ? "NO ACTION" : requireForeignKeyAction(foreignKey.onUpdate, `${tableName}.${foreignKey.column} ON UPDATE`);
 			if (liveForeignKeys.some((live) => live.column === foreignKey.column && live.referencesTable === foreignKey.referencesTable && live.referencesColumn === foreignKey.referencesColumn && (normalizeForeignKeyAction(live.onDelete) || "NO ACTION") === expectedDelete && (normalizeForeignKeyAction(live.onUpdate) || "NO ACTION") === expectedUpdate)) continue;
-			const detectorSql = renderForeignKeyOrphanDetector(tableName, foreignKey);
-			const repairSql = renderForeignKeyOrphanRepair(tableName, foreignKey);
+			const orphanOptions = await this.getForeignKeyOrphanOptions(tableName, manifest, dbSchema, foreignKey, manifestSchemas);
+			const detectorSql = renderForeignKeyOrphanDetector(tableName, foreignKey, {
+				engine: this.engine,
+				uuidComparison: orphanOptions.uuidComparison,
+				uuidCastSide: orphanOptions.uuidCastSide
+			});
+			const repairSql = renderForeignKeyOrphanRepair(tableName, foreignKey, {
+				engine: this.engine,
+				uuidComparison: orphanOptions.uuidComparison,
+				uuidCastSide: orphanOptions.uuidCastSide,
+				nullable: orphanOptions.nullable
+			});
 			if (liveForeignKeys.some((live) => live.column === foreignKey.column)) {
 				changes.push({
 					type: "add_foreign_key",
@@ -423,7 +433,7 @@ var SchemaComparer = class {
 				});
 				continue;
 			}
-			if (Boolean(dbSchema.columns[foreignKey.column]) && await this.foreignKeyHasOrphans(tableName, foreignKey)) {
+			if (Boolean(dbSchema.columns[foreignKey.column]) && await this.foreignKeyHasOrphans(tableName, foreignKey, orphanOptions)) {
 				changes.push({
 					type: "add_foreign_key",
 					table: tableName,
@@ -448,15 +458,57 @@ var SchemaComparer = class {
 		}
 		return changes;
 	}
-	async foreignKeyHasOrphans(tableName, foreignKey) {
+	async foreignKeyHasOrphans(tableName, foreignKey, options) {
 		try {
-			const result = await this.db.query(renderForeignKeyOrphanDetector(tableName, foreignKey, { limitOne: true }));
+			const result = await this.db.query(renderForeignKeyOrphanDetector(tableName, foreignKey, {
+				engine: this.engine,
+				limitOne: true,
+				uuidComparison: options.uuidComparison,
+				uuidCastSide: options.uuidCastSide
+			}));
 			return (Array.isArray(result) ? result : result.rows || []).length > 0;
 		} catch (error) {
-			logger.debug(`[SchemaComparer] Foreign-key orphan probe unavailable for ${tableName}.${foreignKey.column}; refusing automatic constraint addition`, { error: error instanceof Error ? error.message : String(error) });
-			return true;
+			throw new Error(`[SchemaComparer] Cannot probe ${tableName}.${foreignKey.column} for orphan rows; refusing automatic constraint addition: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
 		}
 	}
+	async getForeignKeyOrphanOptions(tableName, manifest, dbSchema, foreignKey, manifestSchemas) {
+		const sourceColumn = manifest.columns[foreignKey.column];
+		const targetColumn = manifestSchemas[foreignKey.referencesTable]?.columns[foreignKey.referencesColumn];
+		const nullable = sourceColumn?.notNull !== true;
+		const uuidComparison = sourceColumn?.type === "UUID" && (targetColumn === void 0 || targetColumn.type === "UUID");
+		if (!uuidComparison) return {
+			nullable,
+			uuidComparison
+		};
+		const parentSchema = foreignKey.referencesTable === tableName ? dbSchema : await this.db.getTableSchema?.(foreignKey.referencesTable);
+		const childType = dbSchema.columns[foreignKey.column]?.type;
+		const parentType = parentSchema?.columns[foreignKey.referencesColumn]?.type;
+		if (!childType || !parentType) return {
+			nullable,
+			uuidComparison
+		};
+		const childTypeNormalized = this.normalizeType(childType);
+		const parentTypeNormalized = this.normalizeType(parentType);
+		if (childTypeNormalized === parentTypeNormalized) return {
+			nullable,
+			uuidComparison: false
+		};
+		if (childTypeNormalized === "UUID") return {
+			nullable,
+			uuidComparison,
+			uuidCastSide: "parent"
+		};
+		if (parentTypeNormalized === "UUID") return {
+			nullable,
+			uuidComparison,
+			uuidCastSide: "child"
+		};
+		return {
+			nullable,
+			uuidComparison,
+			uuidCastSide: "both"
+		};
+	}
 	/**
 	* Compare columns between manifest and database.
 	*