pqb 0.65.2 → 0.65.3

package/dist/index.js

@@ -305,6 +305,11 @@ const colors = {
 	greenBold: (s) => `\x1b[1m\x1b[32m${s}\x1b[0m`,
 	pale: (s) => `\x1b[2m${s}\x1b[0m`
 };
+const commitSql = { text: "COMMIT" };
+const rollbackSql = { text: "ROLLBACK" };
+const quoteIdentifier = (role) => {
+	return `"${role.replace(/"/g, "\"\"")}"`;
+};
 /**
 * Symbol that turns on a snake case column names.
 * It is set on the column types.
@@ -3537,9 +3542,6 @@ var QueryLog = class {
 		return q;
 	}
 };
-const quoteRoleIdentifier = (role) => {
-	return `"${role.replace(/"/g, "\"\"")}"`;
-};
 const hasSqlSessionContextOptions = (options) => {
 	return options.role !== void 0 || options.setConfig !== void 0;
 };
@@ -3547,9 +3549,6 @@ const hasActiveSqlSessionContext = (state) => {
 	if (!state) return false;
 	return state.role !== void 0 || state.setConfig !== void 0;
 };
-const sqlSessionContextNormalizeSetConfig = (setConfig) => {
-	return Object.fromEntries(Object.entries(setConfig).map(([key, value]) => [key, String(value)]));
-};
 const buildConfigRestoreExpression = (key, value) => {
 	const escapedKey = key.replace(/'/g, "''");
 	if (value === null || value === void 0) value = "";
@@ -3558,7 +3557,7 @@ const buildConfigRestoreExpression = (key, value) => {
 const sqlSessionContextSetStorageOptions = (query, state, options, result) => {
 	if (hasSqlSessionContextOptions(options) && hasActiveSqlSessionContext(state)) throw new NestedSqlSessionError(query);
 	if (options.role !== void 0) result.role = options.role;
-	if (options.setConfig) result.setConfig = sqlSessionContextNormalizeSetConfig(options.setConfig);
+	if (options.setConfig) result.setConfig = options.setConfig;
 };
 const sqlSessionContextMergeStorageState = (state, options) => {
 	if (!options) return state;
@@ -3580,7 +3579,7 @@ const sqlSessionContextComputeSetup = (desired) => {
 	if (!hasRole && !hasConfig) return void 0;
 	const result = {};
 	if (hasRole) {
-		result.roleSetupSql = `SET ROLE ${quoteRoleIdentifier(role)}`;
+		result.roleSetupSql = `SET ROLE ${quoteIdentifier(role)}`;
 		result.captureRoleSql = "SELECT current_user";
 	}
 	if (hasConfig && setConfig) {
@@ -3625,7 +3624,7 @@ const sqlSessionContextExecute = async (query, setup, mainQuery) => {
 		return await mainQuery();
 	} finally {
 		const cleanupPromises = [];
-		if (roleSetupSql && captured.previousRole !== void 0) cleanupPromises.push(query(`SET ROLE ${quoteRoleIdentifier(captured.previousRole)}`));
+		if (roleSetupSql && captured.previousRole !== void 0) cleanupPromises.push(query(`SET ROLE ${quoteIdentifier(captured.previousRole)}`));
 		if (captured.previousConfigs) {
 			const restoreSql = sqlSessionContextBuildConfigRestoreBatchSql(captured.previousConfigs);
 			if (restoreSql) cleanupPromises.push(query(restoreSql));
@@ -3633,14 +3632,12 @@ const sqlSessionContextExecute = async (query, setup, mainQuery) => {
 		await Promise.all(cleanupPromises);
 	}
 };
-const processStorageOptions = (query, state, options) => {
-	let log;
-	if (options.log !== void 0 && !query.q.log) log = logParamToLogObject(query.q.logger, options.log);
-	const result = {};
+const processStorageOptions = (query, state, { log: enableLog, ...options }) => {
+	const log = enableLog === void 0 ? query.q.log : logParamToLogObject(query.q.logger, enableLog);
+	const result = options;
 	if (log) result.log = log;
 	if ("schema" in options) result.schema = options.schema;
 	sqlSessionContextSetStorageOptions(query, state, options, result);
-	if (result.log === void 0 && result.schema === void 0 && result.role === void 0 && result.setConfig === void 0) return;
 	return result;
 };
 let currentDefaultSchema;
@@ -3662,8 +3659,6 @@ var QueryStorage = class {
 		return !opts ? state ? this.internal.asyncStorage.run(state, cb) : cb() : this.internal.asyncStorage.run(newState, cb);
 	}
 };
-const commitSql = { text: "COMMIT" };
-const rollbackSql = { text: "ROLLBACK" };
 /**
 * `AfterCommitError` is thrown when one of after commit hooks throws.
 *
@@ -3746,81 +3741,8 @@ var QueryTransaction = class QueryTransaction {
 			options = typeof cbOrOptions === "object" ? cbOrOptions : { level: cbOrOptions };
 			fn = cb;
 		}
-		const sql = { values: emptyArray };
-		const opts = processStorageOptions(this, void 0, options);
-		const log = opts?.log || this.q.log;
-		let logData;
-		let state = this.internal.asyncStorage.getStore();
-		const transactionId = state?.transactionId !== void 0 ? state.transactionId + 1 : 0;
-		const callback = (transactionAdapter) => {
-			if (log) log.afterQuery(sql, logData);
-			if (log) logData = log.beforeQuery(commitSql);
-			if (state) {
-				state.transactionId = transactionId;
-				return fn();
-			}
-			state = {
-				...opts,
-				transactionAdapter,
-				transactionId
-			};
-			if (options.log !== void 0) state.log = log;
-			return this.internal.asyncStorage.run(state, fn);
-		};
-		const transactionAdapter = state?.transactionAdapter;
-		if (!state || !transactionAdapter) {
-			let transactionOptions;
-			if (options.level) transactionOptions = { options: `ISOLATION LEVEL ${options.level}` };
-			if (options.readOnly !== void 0) {
-				const add = `READ ${options.readOnly ? "ONLY" : "WRITE"}`;
-				const opts = transactionOptions ??= {};
-				if (opts.options) opts.options += " " + add;
-				else opts.options = add;
-			}
-			if (options.deferrable !== void 0) {
-				const add = `${options.deferrable ? "" : "NOT "}DEFERRABLE`;
-				const opts = transactionOptions ??= {};
-				if (opts.options) opts.options += " " + add;
-				else opts.options = add;
-			}
-			if (log) {
-				sql.text = transactionOptions?.options ? `BEGIN ${transactionOptions.options}` : "BEGIN";
-				logData = log.beforeQuery(sql);
-			}
-			const result = await this.q.adapter.transaction(transactionOptions, callback).catch((err) => {
-				if (log) log.afterQuery(rollbackSql, logData);
-				throw err;
-			});
-			if (log) log.afterQuery(commitSql, logData);
-			runAfterCommit(state.afterCommit, result);
-			return result;
-		} else try {
-			sql.text = `SAVEPOINT "t${transactionId}"`;
-			if (log) logData = log.beforeQuery(sql);
-			await transactionAdapter.arrays(sql.text, sql.values);
-			let result;
-			try {
-				result = await callback(transactionAdapter);
-			} catch (err) {
-				sql.text = `ROLLBACK TO SAVEPOINT "t${transactionId}"`;
-				if (log) logData = log.beforeQuery(sql);
-				await transactionAdapter.arrays(sql.text, sql.values);
-				if (log) log.afterQuery(sql, logData);
-				throw err;
-			}
-			sql.text = `RELEASE SAVEPOINT "t${transactionId}"`;
-			if (log) logData = log.beforeQuery(sql);
-			await transactionAdapter.arrays(sql.text, sql.values);
-			if (log) log.afterQuery(sql, logData);
-			if (transactionId === state.testTransactionCount) {
-				const { afterCommit } = state;
-				state.afterCommit = void 0;
-				runAfterCommit(afterCommit, result);
-			}
-			return result;
-		} finally {
-			state.transactionId = transactionId - 1;
-		}
+		let opts = processStorageOptions(this, void 0, options);
+		return this.q.adapter.transaction(this.internal.asyncStorage, opts, fn);
 	}
 	/**
 	* Use the `$ensureTransaction` when you want to ensure the sequence of queries is running in a transaction, but there is no need for Postgres [savepoints](https://www.postgresql.org/docs/current/sql-savepoint.html).
@@ -3932,49 +3854,6 @@ var QueryTransaction = class QueryTransaction {
 		return q;
 	}
 };
-const runAfterCommit = (afterCommit, result) => {
-	queueMicrotask(async () => {
-		if (afterCommit) {
-			const promises = [];
-			let catchAfterCommitErrors;
-			for (let i = 0, len = afterCommit.length; i < len;) {
-				const first = afterCommit[i];
-				if (typeof first === "function") {
-					try {
-						promises.push(first());
-					} catch (err) {
-						promises.push(Promise.reject(err));
-					}
-					i++;
-				} else {
-					const q = afterCommit[i + 1];
-					if (q.q.catchAfterCommitErrors) (catchAfterCommitErrors ??= []).push(...q.q.catchAfterCommitErrors);
-					for (const fn of afterCommit[i + 2]) try {
-						promises.push(fn(first, q));
-					} catch (err) {
-						promises.push(Promise.reject(err));
-					}
-					i += 3;
-				}
-			}
-			const getHookNames = () => {
-				const hookNames = [];
-				for (let i = 0, len = afterCommit.length; i < len;) {
-					const first = afterCommit[i];
-					if (typeof first === "function") {
-						hookNames.push(first.name);
-						i++;
-					} else {
-						for (const fn of afterCommit[i + 2]) hookNames.push(fn.name);
-						i += 3;
-					}
-				}
-				return hookNames;
-			};
-			await _runAfterCommitHooks(result, promises, getHookNames, catchAfterCommitErrors);
-		}
-	});
-};
 /**
 * See `transform` query method.
 * This helper applies all transform functions to a result.
@@ -4440,7 +4319,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 			else {
 				const { batch } = sql;
 				if (log) logData = log.beforeQuery(beginSql);
-				await adapter.transaction(async () => {
+				await adapter.transaction(void 0, void 0, async () => {
 					if (log) log.afterQuery(beginSql, logData);
 					const res = await queryBatch(batch);
 					if (log) logData = log.beforeQuery(commitSql);
@@ -13746,34 +13625,34 @@ const _initQueryBuilder = (adapter, columnTypes, asyncStorage, commonOptions, op
 	qb.internal.managedRolesSql = options.managedRolesSql;
 	return qb.qb = qb;
 };
-const mergeLocals = (locals, options) => options?.locals ? {
-	...locals,
-	...options.locals
-} : locals;
-const getSetLocalsSql = (options) => {
-	if (!options?.locals) return;
-	return Object.entries(options.locals).map(([key, value]) => `SET LOCAL ${key}=${value}`).join("; ");
-};
-const getResetLocalsSql = (parentLocals, options) => {
-	if (!options?.locals) return;
-	return Object.entries(options.locals).reduce((acc, [key, value]) => {
-		if (parentLocals[key] !== value) acc.push(`SET LOCAL ${key}=${parentLocals[key]}`);
-		return acc;
-	}, []).join("; ");
+const getSetRoleSql = (parentRole, options) => {
+	if (!options?.role) return;
+	return parentRole !== options.role ? `SET LOCAL ROLE ${quoteIdentifier(options.role)}` : void 0;
 };
-const transactionArgs = {
-	cb: void 0,
-	options: void 0
+const getResetRoleSql = (parentRole, options) => {
+	if (!options?.role) return;
+	return parentRole !== options.role ? parentRole ? `SET LOCAL ROLE ${quoteIdentifier(parentRole)}` : `RESET ROLE` : void 0;
 };
-const getTransactionArgs = (cbOrOptions, optionalCb) => {
-	if (typeof cbOrOptions === "function") {
-		transactionArgs.cb = cbOrOptions;
-		transactionArgs.options = void 0;
-	} else {
-		transactionArgs.options = cbOrOptions;
-		transactionArgs.cb = optionalCb;
-	}
-	return transactionArgs;
+const getSetConfigSql = (parentSetConfig, options) => {
+	if (!options?.setConfig) return;
+	const expressions = Object.entries(options.setConfig).reduce((acc, [key, value]) => {
+		if (!parentSetConfig || parentSetConfig[key] !== value) acc.push(setConfigSql(key, value));
+		return acc;
+	}, []);
+	return expressions.length ? `SELECT ${expressions.join(", ")}` : void 0;
+};
+const getResetSetConfigSql = (parentSetConfig, options) => {
+	if (!options?.setConfig) return;
+	const expressions = Object.entries(options.setConfig).reduce((acc, [key, value]) => {
+		if (parentSetConfig && key in parentSetConfig) {
+			if (parentSetConfig[key] !== value) acc.push(setConfigSql(key, parentSetConfig[key]));
+		} else acc.push(setConfigSql(key, void 0));
+		return acc;
+	}, []);
+	return expressions.length ? `SELECT ${expressions.join(", ")}` : void 0;
+};
+const setConfigSql = (key, value) => {
+	return `set_config('${key.replace(/'/g, "''")}', '${typeof value === "string" ? value.replace(/'/g, "''") : value === void 0 ? "" : value}', true)`;
 };
 /**
 * Shared runtime adapter orchestrator over a driver-specific adapter implementation.
@@ -13781,8 +13660,12 @@ const getTransactionArgs = (cbOrOptions, optionalCb) => {
 var AdapterClass = class AdapterClass {
 	constructor(params) {
 		this.params = params;
+		this.close = async () => {
+			const { pool } = this;
+			this.pool = this.driverAdapter.configure(this.config);
+			await this.driverAdapter.close(pool);
+		};
 		this.config = { ...params.config };
-		this.locals = this.config.locals || emptyObject;
 		if (this.config.connectRetry) {
 			const connectRetryConfig = makeConnectRetryConfig(this.config.connectRetry === true ? emptyObject : this.config.connectRetry);
 			if (connectRetryConfig) {
@@ -13826,29 +13709,8 @@ var AdapterClass = class AdapterClass {
 	getSchema() {
 		return this.connectionState.schema;
 	}
-	transaction(cbOrOptions, optionalCb) {
-		const { cb, options } = getTransactionArgs(cbOrOptions, optionalCb);
-		return this.driverAdapter.begin(this.pool, (client) => {
-			let promises;
-			if (options?.sqlSessionState) {
-				const { role, setConfig } = options.sqlSessionState;
-				if (role) (promises ??= []).push(this.driverAdapter.queryClient(client, `SET ROLE ${role}`));
-				if (setConfig && Object.keys(setConfig).length > 0) {
-					const setExpressions = Object.entries(setConfig).map(([key, value]) => `set_config('${key.replace(/'/g, "''")}', '${typeof value === "string" ? value.replace(/'/g, "''") : value}', true)`).join(", ");
-					(promises ??= []).push(this.driverAdapter.queryClient(client, `SELECT ${setExpressions}`));
-				}
-			}
-			const localsSql = getSetLocalsSql(options);
-			if (localsSql) (promises ??= []).push(this.driverAdapter.queryClient(client, localsSql));
-			const locals = mergeLocals(this.locals, options);
-			const transaction = cb(new TransactionAdapterClass(this, locals, client));
-			return promises ? Promise.all(promises).then(() => transaction) : transaction;
-		}, options?.options);
-	}
-	async close() {
-		const { pool } = this;
-		this.pool = this.driverAdapter.configure(this.config);
-		await this.driverAdapter.close(pool);
+	transaction(asyncStorage, options, cb) {
+		return transaction(asyncStorage, this, this.driverAdapter, this.pool, options, cb);
 	}
 	assignError(to, from) {
 		const { errorFields } = this.driverAdapter;
@@ -13858,10 +13720,9 @@ var AdapterClass = class AdapterClass {
 /**
 * Shared runtime transaction adapter orchestrator over a driver-specific transaction adapter.
 */
-var TransactionAdapterClass = class TransactionAdapterClass {
-	constructor(adapter, locals, client) {
+var TransactionAdapterClass = class {
+	constructor(adapter, client) {
 		this.adapter = adapter;
-		this.locals = locals;
 		this.client = client;
 		this.driverAdapter = adapter.driverAdapter;
 		this.errorClass = this.adapter.errorClass;
@@ -13895,31 +13756,8 @@ var TransactionAdapterClass = class TransactionAdapterClass {
 	getSchema() {
 		return this.adapter.getSchema();
 	}
-	async transaction(cbOrOptions, optionalCb) {
-		const { cb, options } = getTransactionArgs(cbOrOptions, optionalCb);
-		let capturedRole;
-		const capturedConfigs = {};
-		const sqlSession = options?.sqlSessionState;
-		if (sqlSession) {
-			if (sqlSession.role) capturedRole = (await this.driverAdapter.queryClient(this.client, "SELECT current_role as role")).rows[0].role;
-			if (sqlSession.setConfig && Object.keys(sqlSession.setConfig).length > 0) for (const key of Object.keys(sqlSession.setConfig)) capturedConfigs[key] = (await this.driverAdapter.queryClient(this.client, `SELECT current_setting('${key.replace(/'/g, "''")}', true) as val`)).rows[0].val;
-		}
-		const localsSql = getSetLocalsSql(options);
-		if (localsSql) this.driverAdapter.queryClient(this.client, localsSql);
-		const locals = mergeLocals(this.locals, options);
-		try {
-			return await cb(new TransactionAdapterClass(this.adapter, locals, this.client));
-		} finally {
-			if (sqlSession) {
-				if (capturedRole !== void 0) await this.driverAdapter.queryClient(this.client, `SET ROLE ${capturedRole}`);
-				for (const [key, value] of Object.entries(capturedConfigs)) {
-					const restoreValue = value === null ? "" : value;
-					await this.driverAdapter.queryClient(this.client, `SELECT set_config('${key.replace(/'/g, "''")}', '${restoreValue.replace(/'/g, "''")}', true)`);
-				}
-			}
-			const resetLocalsSql = getResetLocalsSql(this.locals, options);
-			if (resetLocalsSql) await this.driverAdapter.queryClient(this.client, resetLocalsSql);
-		}
+	async transaction(asyncStorage, options, cb) {
+		return transaction(asyncStorage, this.adapter, this.driverAdapter, this.client, options, cb, this);
 	}
 	close() {
 		return this.adapter.close();
@@ -13928,6 +13766,165 @@ var TransactionAdapterClass = class TransactionAdapterClass {
 		return this.adapter.assignError(to, from);
 	}
 };
+const transaction = (asyncStorage, adapter, driverAdapter, poolOrClient, options, cb, transactionAdapter) => {
+	const sql = { values: emptyArray };
+	const log = options?.log;
+	const state = asyncStorage?.getStore();
+	const ctx = {
+		state,
+		logData: void 0
+	};
+	const transactionId = state?.transactionId !== void 0 ? state.transactionId + 1 : 0;
+	const fn = (transactionAdapter) => {
+		if (log) log.afterQuery(sql, ctx.logData);
+		if (log) ctx.logData = log.beforeQuery(commitSql);
+		if (state || !asyncStorage) {
+			const parentTransactionRole = state?.transactionRole;
+			const parentTransactionSetConfig = state?.transactionSetConfig;
+			if (state) {
+				state.transactionId = transactionId;
+				if (options) {
+					if (options.role) state.transactionRole = options.role;
+					if (options.setConfig) state.transactionSetConfig = {
+						...state.transactionSetConfig,
+						...options.setConfig
+					};
+				}
+			}
+			return Promise.resolve(cb(transactionAdapter)).finally(() => {
+				if (state) {
+					state.transactionId = transactionId - 1;
+					state.transactionRole = parentTransactionRole;
+					state.transactionSetConfig = parentTransactionSetConfig;
+				}
+			});
+		}
+		ctx.state = {
+			...options,
+			role: void 0,
+			setConfig: void 0,
+			transactionAdapter,
+			transactionId,
+			transactionRole: options?.role,
+			transactionSetConfig: options?.setConfig
+		};
+		return asyncStorage.run(ctx.state, () => cb(transactionAdapter));
+	};
+	transactionAdapter ??= state?.transactionAdapter;
+	if (transactionAdapter) return nestedTransaction(adapter, driverAdapter, transactionAdapter, poolOrClient, options, fn, ctx, transactionId, sql, log);
+	else return realTransaction(adapter, driverAdapter, poolOrClient, options, fn, ctx, sql, log);
+};
+const realTransaction = async (adapter, driverAdapter, pool, options, cb, ctx, sql, log) => {
+	let trxOpts;
+	if (options?.level) trxOpts = `ISOLATION LEVEL ${options.level}`;
+	if (options?.readOnly !== void 0) {
+		const add = `READ ${options.readOnly ? "ONLY" : "WRITE"}`;
+		trxOpts = trxOpts ? trxOpts + " " + add : add;
+	}
+	if (options?.deferrable !== void 0) {
+		const add = `${options.deferrable ? "" : "NOT "}DEFERRABLE`;
+		trxOpts = trxOpts ? trxOpts + " " + add : add;
+	}
+	if (log) {
+		sql.text = trxOpts ? `BEGIN ${trxOpts}` : "BEGIN";
+		ctx.logData = log.beforeQuery(sql);
+	}
+	const result = await driverAdapter.begin(pool, (client) => {
+		let promises;
+		const setRoleSql = getSetRoleSql(void 0, options);
+		if (setRoleSql) (promises ??= []).push(driverAdapter.queryClient(client, setRoleSql));
+		const setConfigSql = getSetConfigSql(void 0, options);
+		if (setConfigSql) (promises ??= []).push(driverAdapter.queryClient(client, setConfigSql));
+		const transaction = cb(new TransactionAdapterClass(adapter, client));
+		return promises ? Promise.all(promises).then(() => transaction) : transaction;
+	}, trxOpts).catch((err) => {
+		if (log) log.afterQuery(rollbackSql, ctx.logData);
+		throw err;
+	});
+	if (log) log.afterQuery(commitSql, ctx.logData);
+	if (ctx.state) runAfterCommit(ctx.state.afterCommit, result);
+	return result;
+};
+const nestedTransaction = async (adapter, driverAdapter, transactionAdapter, client, options, cb, ctx, transactionId, sql, log) => {
+	const state = ctx.state;
+	const parentRole = state?.transactionRole;
+	const parentSetConfig = state?.transactionSetConfig;
+	sql.text = `SAVEPOINT "t${transactionId}"`;
+	if (log) ctx.logData = log.beforeQuery(sql);
+	await transactionAdapter.arrays(sql.text, sql.values);
+	const setRoleSql = getSetRoleSql(parentRole, options);
+	if (setRoleSql) driverAdapter.queryClient(client, setRoleSql);
+	const setConfigSql = getSetConfigSql(parentSetConfig, options);
+	if (setConfigSql) driverAdapter.queryClient(client, setConfigSql);
+	let result;
+	try {
+		result = await cb(new TransactionAdapterClass(adapter, client));
+	} catch (err) {
+		sql.text = `ROLLBACK TO SAVEPOINT "t${transactionId}"`;
+		if (log) ctx.logData = log.beforeQuery(sql);
+		await transactionAdapter.arrays(sql.text, sql.values);
+		if (log) log.afterQuery(sql, ctx.logData);
+		throw err;
+	} finally {
+		const resetRoleSql = getResetRoleSql(parentRole, options);
+		if (resetRoleSql) await driverAdapter.queryClient(client, resetRoleSql);
+	}
+	const resetSetConfigSql = getResetSetConfigSql(parentSetConfig, options);
+	if (resetSetConfigSql) driverAdapter.queryClient(client, resetSetConfigSql);
+	sql.text = `RELEASE SAVEPOINT "t${transactionId}"`;
+	if (log) ctx.logData = log.beforeQuery(sql);
+	await transactionAdapter.arrays(sql.text, sql.values);
+	if (log) log.afterQuery(sql, ctx.logData);
+	if (ctx.state && transactionId === ctx.state.testTransactionCount) {
+		const { afterCommit } = ctx.state;
+		ctx.state.afterCommit = void 0;
+		runAfterCommit(afterCommit, result);
+	}
+	return result;
+};
+const runAfterCommit = (afterCommit, result) => {
+	queueMicrotask(async () => {
+		if (afterCommit) {
+			const promises = [];
+			let catchAfterCommitErrors;
+			for (let i = 0, len = afterCommit.length; i < len;) {
+				const first = afterCommit[i];
+				if (typeof first === "function") {
+					try {
+						promises.push(first());
+					} catch (err) {
+						promises.push(Promise.reject(err));
+					}
+					i++;
+				} else {
+					const q = afterCommit[i + 1];
+					if (q.q.catchAfterCommitErrors) (catchAfterCommitErrors ??= []).push(...q.q.catchAfterCommitErrors);
+					for (const fn of afterCommit[i + 2]) try {
+						promises.push(fn(first, q));
+					} catch (err) {
+						promises.push(Promise.reject(err));
+					}
+					i += 3;
+				}
+			}
+			const getHookNames = () => {
+				const hookNames = [];
+				for (let i = 0, len = afterCommit.length; i < len;) {
+					const first = afterCommit[i];
+					if (typeof first === "function") {
+						hookNames.push(first.name);
+						i++;
+					} else {
+						for (const fn of afterCommit[i + 2]) hookNames.push(fn.name);
+						i += 3;
+					}
+				}
+				return hookNames;
+			};
+			await _runAfterCommitHooks(result, promises, getHookNames, catchAfterCommitErrors);
+		}
+	});
+};
 const runQueryHandlePool = async (pool, driverAdapter, text, values, startingSavepoint, releasingSavepoint, sqlSessionState, arraysMode, client) => {
 	const setup = sqlSessionContextComputeSetup(sqlSessionState);
 	if (client || !driverAdapter.manualPool && !setup) return runQueryHandleSetupAndCleanup(driverAdapter, client || pool, text, values, startingSavepoint, releasingSavepoint, setup, arraysMode);
@@ -13987,13 +13984,13 @@ const cloneAdapterConfig = (config, params) => {
 	return clonedConfig;
 };
 const createDriverAdapterConfig = (config, state) => {
-	const locals = config.locals ? { ...config.locals } : {};
-	delete locals.search_path;
-	if (state.searchPath && state.searchPath !== "public") locals.search_path = state.searchPath;
+	const setConfig = config.setConfig ? { ...config.setConfig } : {};
+	delete setConfig.search_path;
+	if (state.searchPath && state.searchPath !== "public") setConfig.search_path = state.searchPath;
 	const driverConfig = {
 		...config,
 		searchPath: state.searchPath,
-		locals
+		setConfig
 	};
 	if (driverConfig.databaseURL) {
 		const url = new URL(driverConfig.databaseURL);
@@ -14213,7 +14210,7 @@ const testTransaction = {
 		const data = db.internal[trxForTest];
 		const last = data?.pop();
 		if (!last) return;
-		if (data?.length === 1) Object.assign(db.baseQuery.q.adapter, data[0].adapter);
+		if (!data?.length) Object.assign(db.baseQuery.q.adapter, last.adapter);
 		last.reject?.(new Rollback());
 		return last.promise;
 	},