pqb 0.73.2 → 0.73.3

package/dist/index.js

@@ -4124,6 +4124,81 @@ const getResetSetConfigSql = (parentSetConfig, options) => {
 const setConfigSql = (key, value) => {
 	return `set_config('${key.replace(/'/g, "''")}', '${typeof value === "string" ? value.replace(/'/g, "''") : value === void 0 ? "" : value}', true)`;
 };
+var Rollback = class extends Error {};
+const trxForTest = Symbol("trxForTest");
+const argToDb = (arg) => "$qb" in arg ? arg.$qb : arg;
+const testTransaction = {
+	/**
+	* Start a test transaction.
+	* The returned promise is resolved immediately when transaction starts, not waiting for it to end.
+	*
+	* @param arg - ORM instance or a queryable instance (such as db.someTable).
+	*/
+	start(arg) {
+		const db = argToDb(arg);
+		const { asyncStorage } = db.internal;
+		const { getStore } = asyncStorage;
+		const { adapter } = db.baseQuery.q;
+		const data = { adapter: {
+			query: adapter.query,
+			arrays: adapter.arrays,
+			transaction: adapter.transaction
+		} };
+		(db.internal[trxForTest] ??= []).push(data);
+		return new Promise((resolve) => {
+			data.promise = db.transaction(() => {
+				resolve();
+				return new Promise((_, rej) => {
+					const state = asyncStorage.getStore();
+					db.internal.asyncStorage.getStore = () => state;
+					const t = state?.transactionAdapter;
+					if (t) {
+						adapter.query = t.query.bind(t);
+						adapter.arrays = t.arrays.bind(t);
+						adapter.transaction = t.transaction.bind(t);
+						state.testTransactionCount = state.testTransactionCount ? state.testTransactionCount + 1 : 1;
+					}
+					data.reject = rej;
+				});
+			}).catch((err) => {
+				if (!(err instanceof Rollback)) throw err;
+			}).finally(() => {
+				const state = db.internal.asyncStorage.getStore();
+				if (state?.testTransactionCount) state.testTransactionCount--;
+				db.internal.asyncStorage.getStore = getStore;
+			});
+		});
+	},
+	/**
+	* Rollback a test transaction.
+	*
+	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
+	*/
+	rollback(arg) {
+		const db = argToDb(arg);
+		const data = db.internal[trxForTest];
+		const last = data?.pop();
+		if (!last) return;
+		if (!data?.length) Object.assign(db.baseQuery.q.adapter, last.adapter);
+		last.reject?.(new Rollback());
+		return last.promise;
+	},
+	/**
+	* Will roll back the current `testTransaction` (won't have any effect if it was rolled back already),
+	* and if there's no nested test transactions left, it will close the db connection.
+	*
+	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
+	*/
+	async close(arg) {
+		const db = argToDb(arg);
+		await this.rollback(db);
+		if (db.internal[trxForTest]?.length === 0) return db.q.adapter.close();
+	}
+};
+const logSavepointRollback = (log, error, rollbackSql, rollbackLogData) => {
+	if (error instanceof Rollback) log.afterQuery(rollbackSql, rollbackLogData);
+	else if (error) log.onError(error, rollbackSql, rollbackLogData);
+};
 /**
 * Shared runtime adapter orchestrator over a driver-specific adapter implementation.
 */
@@ -4256,7 +4331,7 @@ var TransactionAdapterClass = class {
 			rollbackSql = { text: `ROLLBACK TO SAVEPOINT "${name}"` };
 			rollbackLogData = log.beforeQuery(rollbackSql);
 		}, () => {
-			if (error) log.onError(error, rollbackSql, rollbackLogData);
+			logSavepointRollback(log, error, rollbackSql, rollbackLogData);
 		});
 	}
 	hackySavepoint(state, text, values, arraysMode, log) {
@@ -4279,7 +4354,7 @@ var TransactionAdapterClass = class {
 			rollbackSql = { text: `ROLLBACK TO SAVEPOINT "${state.name}"` };
 			rollbackLogData = log.beforeQuery(rollbackSql);
 		}, () => {
-			if (error) log.onError(error, rollbackSql, rollbackLogData);
+			logSavepointRollback(log, error, rollbackSql, rollbackLogData);
 		});
 		const activeSavepoint = state.activeSavepoint;
 		if (activeSavepoint) {
@@ -14585,77 +14660,6 @@ function copyTableData(query, arg) {
 	q.toSQL = () => makeCopySql(q, arg);
 	return q;
 }
-var Rollback = class extends Error {};
-const trxForTest = Symbol("trxForTest");
-const argToDb = (arg) => "$qb" in arg ? arg.$qb : arg;
-const testTransaction = {
-	/**
-	* Start a test transaction.
-	* The returned promise is resolved immediately when transaction starts, not waiting for it to end.
-	*
-	* @param arg - ORM instance or a queryable instance (such as db.someTable).
-	*/
-	start(arg) {
-		const db = argToDb(arg);
-		const { asyncStorage } = db.internal;
-		const { getStore } = asyncStorage;
-		const { adapter } = db.baseQuery.q;
-		const data = { adapter: {
-			query: adapter.query,
-			arrays: adapter.arrays,
-			transaction: adapter.transaction
-		} };
-		(db.internal[trxForTest] ??= []).push(data);
-		return new Promise((resolve) => {
-			data.promise = db.transaction(() => {
-				resolve();
-				return new Promise((_, rej) => {
-					const state = asyncStorage.getStore();
-					db.internal.asyncStorage.getStore = () => state;
-					const t = state?.transactionAdapter;
-					if (t) {
-						adapter.query = t.query.bind(t);
-						adapter.arrays = t.arrays.bind(t);
-						adapter.transaction = t.transaction.bind(t);
-						state.testTransactionCount = state.testTransactionCount ? state.testTransactionCount + 1 : 1;
-					}
-					data.reject = rej;
-				});
-			}).catch((err) => {
-				if (!(err instanceof Rollback)) throw err;
-			}).finally(() => {
-				const state = db.internal.asyncStorage.getStore();
-				if (state?.testTransactionCount) state.testTransactionCount--;
-				db.internal.asyncStorage.getStore = getStore;
-			});
-		});
-	},
-	/**
-	* Rollback a test transaction.
-	*
-	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
-	*/
-	rollback(arg) {
-		const db = argToDb(arg);
-		const data = db.internal[trxForTest];
-		const last = data?.pop();
-		if (!last) return;
-		if (!data?.length) Object.assign(db.baseQuery.q.adapter, last.adapter);
-		last.reject?.(new Rollback());
-		return last.promise;
-	},
-	/**
-	* Will roll back the current `testTransaction` (won't have any effect if it was rolled back already),
-	* and if there's no nested test transactions left, it will close the db connection.
-	*
-	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
-	*/
-	async close(arg) {
-		const db = argToDb(arg);
-		await this.rollback(db);
-		if (db.internal[trxForTest]?.length === 0) return db.q.adapter.close();
-	}
-};
 exports.AdapterClass = AdapterClass;
 exports.ArrayColumn = ArrayColumn;
 exports.BigIntColumn = BigIntColumn;