rake-db 2.33.10 → 2.33.12

package/dist/index.mjs

@@ -521,6 +521,7 @@ const addOrDropChanges = [];
 function add(item, options) {
 	consumeColumnName();
 	setName(this, item);
+	if (isNoForeignKeyChangeInput(item)) throw new Error("t.noForeignKey() is only supported in t.change(...)");
 	if (item instanceof Column) {
 		const result = addOrDrop("add", item, options);
 		if (result.type === "change") return result;
@@ -544,6 +545,7 @@ function add(item, options) {
 const drop = function(item, options) {
 	consumeColumnName();
 	setName(this, item);
+	if (isNoForeignKeyChangeInput(item)) throw new Error("t.noForeignKey() is only supported in t.change(...)");
 	if (item instanceof Column) {
 		const result = addOrDrop("drop", item, options);
 		if (result.type === "change") return result;
@@ -587,6 +589,28 @@ const addOrDrop = (type, item, options) => {
 		dropMode: options?.dropMode
 	};
 };
+const isColumnForeignKeyChangeInput = (item) => {
+	return "columnForeignKey" in item;
+};
+const isNoForeignKeyChangeInput = (item) => {
+	return "noForeignKey" in item;
+};
+const isCheckConstraintItem = (item) => {
+	return !!item.constraint?.check;
+};
+const changeInputToColumnChange = (item, opposite) => {
+	if (item instanceof Column || "type" in item) return columnTypeToColumnChange(item);
+	if (isColumnForeignKeyChangeInput(item)) return { foreignKeys: [item.columnForeignKey] };
+	if (isNoForeignKeyChangeInput(item)) {
+		if (!isColumnForeignKeyChangeInput(opposite)) throw new Error("t.noForeignKey() in t.change(...) must be paired with t.foreignKey(...)");
+		return { foreignKeys: [] };
+	}
+	if (isCheckConstraintItem(item)) return { checks: [{
+		sql: item.constraint.check,
+		name: item.constraint.name
+	}] };
+	throw new Error("t.change(...) supports t.check(...) only for check constraints in this form");
+};
 const columnTypeToColumnChange = (item, name) => {
 	if (item instanceof Column) {
 		let column = item;
@@ -618,6 +642,18 @@ const setName = (self, item) => {
 	else if (item instanceof Column) item.data.name ??= name;
 	else item.name ??= name;
 };
+function foreignKey(...args) {
+	if (Array.isArray(args[0])) {
+		const [columns, fnOrTable, foreignColumns, options] = args;
+		return tableDataMethods.foreignKey(columns, fnOrTable, foreignColumns, options);
+	}
+	const [fnOrTable, foreignColumn, options] = args;
+	return { columnForeignKey: {
+		fnOrTable,
+		foreignColumns: [foreignColumn],
+		options
+	} };
+}
 const tableChangeMethods = {
 	...tableMethods,
 	...tableDataMethods,
@@ -629,10 +665,14 @@ const tableChangeMethods = {
 	},
 	add,
 	drop,
+	foreignKey,
+	noForeignKey() {
+		return { noForeignKey: true };
+	},
 	change(from, to, using) {
 		consumeColumnName();
-		const f = columnTypeToColumnChange(from);
-		const t = columnTypeToColumnChange(to);
+		const f = changeInputToColumnChange(from, to);
+		const t = changeInputToColumnChange(to, from);
 		setName(this, f);
 		setName(this, t);
 		return {
@@ -2095,7 +2135,7 @@ const wrapWithEnhancingError = async (text, values, promise) => {
 	try {
 		return await promise;
 	} catch (err) {
-		if (err && typeof err === "object" && "message" in err && typeof err.message === "string" && err.constructor.name === "PostgresError") {
+		if (err && typeof err === "object" && "message" in err && typeof err.message === "string" && (err.constructor.name === "PostgresError" || err.constructor.name === "DatabaseError")) {
 			err.message += `\nSQL: ${text}${values ? `\nVariables: ${JSON.stringify(values)}` : ""}`;
 			throw new err.constructor(err);
 		}
@@ -2569,13 +2609,11 @@ const getMaybeTransactionAdapter = (db) => "$getAdapter" in db ? db.$getAdapter(
 const runSqlInSavePoint = async (db, sql, code) => {
 	const adapter = getMaybeTransactionAdapter(db);
 	try {
-		await adapter.query(adapter.isInTransaction() ? `SAVEPOINT s; ${sql}; RELEASE SAVEPOINT s` : sql);
+		const query = () => adapter.query(sql);
+		await (adapter.isInTransaction() ? adapter.savepoint("s", query) : query());
 		return "done";
 	} catch (err) {
-		if (err.code === code) {
-			if (adapter.isInTransaction()) await adapter.query(`ROLLBACK TO SAVEPOINT s`);
-			return "already";
-		}
+		if (err.code === code) return "already";
 		throw err;
 	}
 };
@@ -2705,17 +2743,14 @@ const deleteMigratedVersion = async (adapter, version, name, config) => {
 var NoMigrationsTableError = class extends Error {};
 const getMigratedVersionsMap = async (ctx, adapter, config, renameTo) => {
 	const table = migrationsSchemaTableSql(adapter, config);
-	const inTransaction = "isInTransaction" in adapter && adapter.isInTransaction();
+	const queryVersion = () => adapter.arrays(`SELECT * FROM ${table} ORDER BY version`);
 	let result;
 	try {
-		if (inTransaction) await adapter.query(`SAVEPOINT check_migrations_table`);
-		result = await adapter.arrays(`SELECT * FROM ${table} ORDER BY version`);
-		if (inTransaction) await adapter.query(`RELEASE SAVEPOINT check_migrations_table`);
+		if (adapter.isInTransaction()) result = await adapter.savepoint("check_migrations_table", queryVersion);
+		else result = await queryVersion();
 	} catch (err) {
-		if (err.code === "42P01") {
-			if (inTransaction) await adapter.query(`ROLLBACK TO SAVEPOINT check_migrations_table`);
-			throw new NoMigrationsTableError();
-		} else throw err;
+		if (err.code === "42P01") throw new NoMigrationsTableError();
+		else throw err;
 	}
 	if (!result.fields[1]) {
 		const { migrations } = await getMigrations(ctx, config, true);