pqb 0.66.3 → 0.66.4

package/dist/index.mjs

@@ -4093,8 +4093,8 @@ const checkIfNeedResultAllForMutativeQueriesSelectRelations = (sql) => {
 const checkIfShouldReleaseSavepointForMutativeQueriesSelectRelations = (sql) => {
 	return sql.mutativeQueriesSelectRelationsState?.value;
 };
-const loadMutativeQueriesSelectRelations = (sql, result, adapter, startingSavepoint, renames) => sql.mutativeQueriesSelectRelationsState?.value ? loadRelations(sql.mutativeQueriesSelectRelationsState, result, adapter, startingSavepoint, renames) : void 0;
-const loadRelations = async (state, result, adapter, startingSavepoint, renames) => {
+const loadMutativeQueriesSelectRelations = (sql, result, savepointState, renames) => sql.mutativeQueriesSelectRelationsState?.value ? loadRelations(sql.mutativeQueriesSelectRelationsState, result, savepointState, renames) : void 0;
+const loadRelations = async (state, result, savepointState, renames) => {
 	const q = state.query;
 	const primaryKeys = requirePrimaryKeys(q, "Cannot select a relation of a table that has no primary keys");
 	const selectQuery = _unscope(q, "nonDeleted");
@@ -4117,9 +4117,9 @@ const loadRelations = async (state, result, adapter, startingSavepoint, renames)
 	});
 	selectQuery.q.select = select;
 	const relationsResult = await maybeWrappedThen.call(selectQuery, void 0, async (err) => {
-		await adapter.arrays(`ROLLBACK TO SAVEPOINT "${startingSavepoint}"`);
+		await savepointState?.activeSavepoint?.rollback(err);
 		throw err;
-	}, startingSavepoint);
+	}, savepointState);
 	for (const row of result) {
 		const relationRow = relationsResult.find((relationRow) => {
 			return !primaryKeys.some((key, i) => relationRow[relationKeyAliases[i]] !== row[key]);
@@ -4244,7 +4244,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 		let queryResult;
 		let cteData;
 		const startingSavepoint = setCatchingSavepoint(!parentSavepoint && shouldCatch && state);
-		const releasingSavepoint = checkIfShouldReleaseSavepointForMutativeQueriesSelectRelations(sql) || parentSavepoint ? void 0 : startingSavepoint;
+		const releasingSavepoint = checkIfShouldReleaseSavepointForMutativeQueriesSelectRelations(sql) || parentSavepoint ? void 0 : parentSavepoint || startingSavepoint;
 		if ("text" in sql) {
 			if (query.autoPreparedStatements) sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
 			if (log) logData = log.beforeQuery(sql);
@@ -4419,7 +4419,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 				}
 			}
 		}
-		const promise = loadMutativeQueriesSelectRelations(localSql, result, adapter, startingSavepoint, renames) || parseBatch(q, queryResult);
+		const promise = loadMutativeQueriesSelectRelations(localSql, result, startingSavepoint, renames) || parseBatch(q, queryResult);
 		if (promise) await promise;
 		if (tableHook?.select || tempReturnType !== returnType) {
 			if (renames) {
@@ -4465,7 +4465,10 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 	}
 };
 const setCatchingSavepoint = (catchTrx) => {
-	return catchTrx ? `s${catchTrx.catchI = (catchTrx.catchI || 0) + 1}` : void 0;
+	return catchTrx && catchTrx.transactionAdapter ? {
+		transactionAdapter: catchTrx.transactionAdapter,
+		name: `s${catchTrx.catchI = (catchTrx.catchI || 0) + 1}`
+	} : void 0;
 };
 /**
 * Executes a query and in the case there are rows, but nothing was selected,
@@ -4473,7 +4476,17 @@ const setCatchingSavepoint = (catchTrx) => {
 * because user might expect empty objects to be returned for an empty select.
 */
 const execQuery = (adapter, method, sql, startingSavepoint, releasingSavepoint, sqlSessionState) => {
-	return adapter[method](sql.text, sql.values, startingSavepoint, releasingSavepoint, sqlSessionState).then((result) => {
+	let promise;
+	if (startingSavepoint) if (releasingSavepoint) promise = startingSavepoint.transactionAdapter.savepoint(startingSavepoint.name, () => {
+		return promise = adapter[method](sql.text, sql.values, sqlSessionState);
+	});
+	else promise = startingSavepoint.transactionAdapter.hackySavepoint(startingSavepoint, sql.text, sql.values, method === "arrays");
+	else promise = adapter[method](sql.text, sql.values, sqlSessionState);
+	if (!startingSavepoint && releasingSavepoint) promise = promise.then(async (res) => {
+		await releasingSavepoint.activeSavepoint?.release();
+		return res;
+	});
+	return promise.then((result) => {
 		if (result.rowCount && !result.rows.length) {
 			result.rows.length = result.rowCount;
 			result.rows.fill({});
@@ -13217,7 +13230,7 @@ const performQuery = async (q, args, method) => {
 	let logData;
 	if (log) logData = log.beforeQuery(sql);
 	try {
-		const result = await (trx?.transactionAdapter || q.adapterNotInTransaction)[method](sql.text, sql.values, void 0, void 0, sqlSessionContextGetStateFromAsyncState(trx));
+		const result = await (trx?.transactionAdapter || q.adapterNotInTransaction)[method](sql.text, sql.values, sqlSessionContextGetStateFromAsyncState(trx));
 		if (log) log.afterQuery(sql, logData);
 		return result;
 	} catch (err) {
@@ -13667,11 +13680,11 @@ var AdapterClass = class AdapterClass {
 		this.pool = this.driverAdapter.configure(this.config);
 		this.errorClass = this.driverAdapter.errorClass;
 	}
-	query(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
-		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, startingSavepoint, releasingSavepoint, sqlSessionState);
+	query(text, values, sqlSessionState) {
+		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState);
 	}
-	arrays(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
-		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, startingSavepoint, releasingSavepoint, sqlSessionState, true);
+	arrays(text, values, sqlSessionState) {
+		return runQueryHandlePool(this.pool, this.driverAdapter, text, values, sqlSessionState, true);
 	}
 	clone(params) {
 		return new AdapterClass({
@@ -13715,13 +13728,13 @@ var TransactionAdapterClass = class {
 		this.driverAdapter = adapter.driverAdapter;
 		this.errorClass = this.adapter.errorClass;
 	}
-	query(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
+	query(text, values, sqlSessionState) {
 		const setup = sqlSessionContextComputeSetup(sqlSessionState);
-		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, startingSavepoint, releasingSavepoint, setup);
+		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup);
 	}
-	arrays(text, values, startingSavepoint, releasingSavepoint, sqlSessionState) {
+	arrays(text, values, sqlSessionState) {
 		const setup = sqlSessionContextComputeSetup(sqlSessionState);
-		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, startingSavepoint, releasingSavepoint, setup, true);
+		return runQueryHandleSetupAndCleanup(this.driverAdapter, this.client, text, values, setup, true);
 	}
 	clone(params) {
 		return this.adapter.clone(params);
@@ -13747,6 +13760,16 @@ var TransactionAdapterClass = class {
 	async transaction(asyncStorage, options, cb) {
 		return transaction(asyncStorage, this.adapter, this.driverAdapter, this.client, options, cb, this);
 	}
+	savepoint(name, cb) {
+		return this.driverAdapter.savepoint(this.client, (client) => {
+			this.client = client;
+		}, name, cb);
+	}
+	hackySavepoint(state, text, values, arraysMode) {
+		return this.driverAdapter.hackySavepoint(this.client, (client) => {
+			this.client = client;
+		}, state, text, values, arraysMode);
+	}
 	close() {
 		return this.adapter.close();
 	}
@@ -13764,7 +13787,7 @@ const transaction = (asyncStorage, adapter, driverAdapter, poolOrClient, options
 	};
 	const transactionId = state?.transactionId !== void 0 ? state.transactionId + 1 : 0;
 	const fn = (transactionAdapter) => {
-		if (log) log.afterQuery(sql, ctx.logData);
+		if (log && sql.text) log.afterQuery(sql, ctx.logData);
 		if (log) ctx.logData = log.beforeQuery(commitSql);
 		if (state || !asyncStorage) {
 			const parentTransactionRole = state?.transactionRole;
@@ -13799,7 +13822,7 @@ const transaction = (asyncStorage, adapter, driverAdapter, poolOrClient, options
 		return asyncStorage.run(ctx.state, () => cb(transactionAdapter));
 	};
 	transactionAdapter ??= state?.transactionAdapter;
-	if (transactionAdapter) return nestedTransaction(adapter, driverAdapter, transactionAdapter, poolOrClient, options, fn, ctx, transactionId, sql, log);
+	if (transactionAdapter) return nestedTransaction(adapter, driverAdapter, transactionAdapter, poolOrClient, options, fn, ctx, transactionId);
 	else return realTransaction(adapter, driverAdapter, poolOrClient, options, fn, ctx, sql, log);
 };
 const realTransaction = async (adapter, driverAdapter, pool, options, cb, ctx, sql, log) => {
@@ -13833,36 +13856,26 @@ const realTransaction = async (adapter, driverAdapter, pool, options, cb, ctx, s
 	if (ctx.state) runAfterCommit(ctx.state.afterCommit, result);
 	return result;
 };
-const nestedTransaction = async (adapter, driverAdapter, transactionAdapter, client, options, cb, ctx, transactionId, sql, log) => {
+const nestedTransaction = async (adapter, driverAdapter, transactionAdapter, client, options, cb, ctx, transactionId) => {
 	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);
+	const result = await transactionAdapter.savepoint(`t${transactionId}`, async () => {
+		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));
+		} finally {
+			const resetRoleSql = getResetRoleSql(parentRole, options);
+			if (resetRoleSql) await driverAdapter.queryClient(client, resetRoleSql);
+		}
+		const resetSetConfigSql = getResetSetConfigSql(parentSetConfig, options);
+		if (resetSetConfigSql) driverAdapter.queryClient(client, resetSetConfigSql);
+		return result;
+	});
 	if (ctx.state && transactionId === ctx.state.testTransactionCount) {
 		const { afterCommit } = ctx.state;
 		ctx.state.afterCommit = void 0;
@@ -13913,19 +13926,19 @@ const runAfterCommit = (afterCommit, result) => {
 		}
 	});
 };
-const runQueryHandlePool = async (pool, driverAdapter, text, values, startingSavepoint, releasingSavepoint, sqlSessionState, arraysMode, client) => {
+const runQueryHandlePool = async (pool, driverAdapter, text, values, sqlSessionState, arraysMode, client) => {
 	const setup = sqlSessionContextComputeSetup(sqlSessionState);
-	if (client || !driverAdapter.manualPool && !setup) return runQueryHandleSetupAndCleanup(driverAdapter, client || pool, text, values, startingSavepoint, releasingSavepoint, setup, arraysMode);
+	if (client || !driverAdapter.manualPool && !setup) return runQueryHandleSetupAndCleanup(driverAdapter, client || pool, text, values, setup, arraysMode);
 	client = await driverAdapter.borrow(pool);
 	try {
-		return await runQueryHandleSetupAndCleanup(driverAdapter, client, text, values, startingSavepoint, releasingSavepoint, setup, arraysMode);
+		return await runQueryHandleSetupAndCleanup(driverAdapter, client, text, values, setup, arraysMode);
 	} finally {
 		driverAdapter.release(client);
 	}
 };
-const runQueryHandleSetupAndCleanup = (driverAdapter, client, text, values, startingSavepoint, releasingSavepoint, setup, arraysMode) => {
-	if (setup) return sqlSessionContextExecute((text, values) => driverAdapter.queryClient(client, text, values, void 0, void 0, true), setup, () => driverAdapter.queryClient(client, text, values, startingSavepoint, releasingSavepoint, arraysMode));
-	return driverAdapter.queryClient(client, text, values, startingSavepoint, releasingSavepoint, arraysMode);
+const runQueryHandleSetupAndCleanup = (driverAdapter, client, text, values, setup, arraysMode) => {
+	if (setup) return sqlSessionContextExecute((text, values) => driverAdapter.queryClient(client, text, values, true), setup, () => driverAdapter.queryClient(client, text, values, arraysMode));
+	return driverAdapter.queryClient(client, text, values, arraysMode);
 };
 const createAdapterConnectionState = (config) => {
 	const state = { originalConfig: { ...config } };