pqb 0.73.0 → 0.73.2

package/dist/index.mjs

@@ -4206,15 +4206,67 @@ 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) => {
+	async savepoint(name, log, cb) {
+		if (!log) return this.driverAdapter.savepoint(this.client, (client) => {
 			this.client = client;
 		}, name, cb);
+		const savepointSql = { text: `SAVEPOINT "${name}"` };
+		const savepointLogData = log.beforeQuery(savepointSql);
+		let releaseSql;
+		let releaseLogData;
+		let rollbackSql;
+		let rollbackLogData;
+		let error;
+		return this.driverAdapter.savepoint(this.client, (client) => {
+			this.client = client;
+		}, name, async () => {
+			try {
+				return await cb();
+			} catch (err) {
+				error = err;
+				throw err;
+			}
+		}, () => log.afterQuery(savepointSql, savepointLogData), () => {
+			releaseSql = { text: `RELEASE SAVEPOINT "${name}"` };
+			releaseLogData = log.beforeQuery(releaseSql);
+		}, () => log.afterQuery(releaseSql, releaseLogData), () => {
+			rollbackSql = { text: `ROLLBACK TO SAVEPOINT "${name}"` };
+			rollbackLogData = log.beforeQuery(rollbackSql);
+		}, () => {
+			if (error) log.onError(error, rollbackSql, rollbackLogData);
+		});
 	}
-	hackySavepoint(state, text, values, arraysMode) {
-		return this.driverAdapter.hackySavepoint(this.client, (client) => {
+	hackySavepoint(state, text, values, arraysMode, log) {
+		if (!log) return this.driverAdapter.hackySavepoint(this.client, (client) => {
 			this.client = client;
 		}, state, text, values, arraysMode);
+		const savepointSql = { text: `SAVEPOINT "${state.name}"` };
+		const savepointLogData = log.beforeQuery(savepointSql);
+		let releaseSql;
+		let releaseLogData;
+		let rollbackSql;
+		let rollbackLogData;
+		let error;
+		const result = this.driverAdapter.hackySavepoint(this.client, (client) => {
+			this.client = client;
+		}, state, text, values, arraysMode, () => log.afterQuery(savepointSql, savepointLogData), () => {
+			releaseSql = { text: `RELEASE SAVEPOINT "${state.name}"` };
+			releaseLogData = log.beforeQuery(releaseSql);
+		}, () => log.afterQuery(releaseSql, releaseLogData), () => {
+			rollbackSql = { text: `ROLLBACK TO SAVEPOINT "${state.name}"` };
+			rollbackLogData = log.beforeQuery(rollbackSql);
+		}, () => {
+			if (error) log.onError(error, rollbackSql, rollbackLogData);
+		});
+		const activeSavepoint = state.activeSavepoint;
+		if (activeSavepoint) {
+			const rollback = activeSavepoint.rollback;
+			activeSavepoint.rollback = async (err) => {
+				error = err;
+				return rollback.call(activeSavepoint, err);
+			};
+		}
+		return result;
 	}
 	close() {
 		return this.adapter.close();
@@ -4306,7 +4358,7 @@ const nestedTransaction = async (adapter, driverAdapter, transactionAdapter, cli
 	const state = ctx.state;
 	const parentRole = state?.transactionRole;
 	const parentSetConfig = state?.transactionSetConfig;
-	const result = await transactionAdapter.savepoint(`t${transactionId}`, async () => {
+	const result = await transactionAdapter.savepoint(`t${transactionId}`, options?.log, async () => {
 		const setRoleSql = getSetRoleSql(parentRole, options);
 		if (setRoleSql) driverAdapter.queryClient(client, setRoleSql);
 		const setConfigSql = getSetConfigSql(parentSetConfig, options);
@@ -4734,7 +4786,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 			if (query.autoPreparedStatements) sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
 			if (log) logData = log.beforeQuery(sql);
 			const method = queryMethodByReturnType[tempReturnType];
-			queryResult = await execQuery(adapter, method, sql, startingSavepoint, releasingSavepoint, sqlSessionContextGetStateFromAsyncState(state));
+			queryResult = await execQuery(adapter, method, sql, log, startingSavepoint, releasingSavepoint, sqlSessionContextGetStateFromAsyncState(state));
 			const { runAfterQuery } = sql;
 			if (log) {
 				log.afterQuery(sql, logData);
@@ -4763,7 +4815,7 @@ const then = async (q, adapter, state, beforeHooks, afterHooks, afterSaveHooks,
 				for (let i = 0; i <= last; i++) {
 					sql = batch[i];
 					if (log) logData = log.beforeQuery(sql);
-					const result = await execQuery(adapter, queryMethod, sql, i === 0 ? startingSavepoint : void 0, i === last ? releasingSavepoint : void 0, sqlSessionContextGetStateFromAsyncState(state));
+					const result = await execQuery(adapter, queryMethod, sql, log, i === 0 ? startingSavepoint : void 0, i === last ? releasingSavepoint : void 0, sqlSessionContextGetStateFromAsyncState(state));
 					if (queryResult) {
 						queryResult.rowCount += result.rowCount;
 						queryResult.rows.push(...result.rows);
@@ -4964,12 +5016,12 @@ const setCatchingSavepoint = (catchTrx) => {
 * it populates the response with empty objects,
 * because user might expect empty objects to be returned for an empty select.
 */
-const execQuery = (adapter, method, sql, startingSavepoint, releasingSavepoint, sqlSessionState) => {
+const execQuery = (adapter, method, sql, log, startingSavepoint, releasingSavepoint, sqlSessionState) => {
 	let promise;
-	if (startingSavepoint) if (releasingSavepoint) promise = startingSavepoint.transactionAdapter.savepoint(startingSavepoint.name, () => {
+	if (startingSavepoint) if (releasingSavepoint) promise = startingSavepoint.transactionAdapter.savepoint(startingSavepoint.name, log, () => {
 		return promise = adapter[method](sql.text, sql.values, sqlSessionState);
 	});
-	else promise = startingSavepoint.transactionAdapter.hackySavepoint(startingSavepoint, sql.text, sql.values, method === "arrays");
+	else promise = startingSavepoint.transactionAdapter.hackySavepoint(startingSavepoint, sql.text, sql.values, method === "arrays", log);
 	else promise = adapter[method](sql.text, sql.values, sqlSessionState);
 	if (!startingSavepoint && releasingSavepoint) promise = promise.then(async (res) => {
 		await releasingSavepoint.activeSavepoint?.release();