rake-db 2.33.11 → 2.33.12

package/dist/index.js

@@ -2158,7 +2158,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);
 		}
@@ -2632,13 +2632,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;
 	}
 };
@@ -2768,17 +2766,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);