dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-28 21:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct runSqlInTransaction

Browse Source
This commit is contained in:
Pavel
2025-06-03 13:07:46 +02:00
parent d5c0f7045e
commit a19648a6e8
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/dbgate-plugin-firebird/src/backend/driver.js
View File

@@ -98,11 +98,9 @@ const driver = {
} }
}, },
async script(dbhan, sql, { useTransaction } = {}) {
if (useTransaction) {
return this.runSqlInTransaction(dbhan, sql);
}
async script(dbhan, sql, { useTransaction } = {}) {
if (useTransaction) return this.runSqlInTransaction(dbhan, sql);
return this.query(dbhan, sql); return this.query(dbhan, sql);
}, },
@@ -164,13 +162,18 @@ const driver = {
}); });
}, },
/**
* @param {import('dbgate-types').DatabaseHandle<Firebird.Database>} dbhan
* @param {string} sql
*/
async runSqlInTransaction(dbhan, sql) { async runSqlInTransaction(dbhan, sql) {
/** @type {Firebird.Transaction} */
let transactionPromise; let transactionPromise;
const sqlItems = splitQuery(sql, driver.sqlSplitterOptions); const sqlItems = splitQuery(sql, driver.sqlSplitterOptions);
try { try {
transactionPromise = await new Promise((resolve, reject) => { transactionPromise = await new Promise((resolve, reject) => {
dbhan.db.transaction(Firebird.ISOLATION_SNAPSHOT, function (err, currentTransaction) { dbhan.client.transaction(Firebird.ISOLATION_SNAPSHOT, function (err, currentTransaction) {
if (err) return reject(err); if (err) return reject(err);
resolve(currentTransaction); resolve(currentTransaction);
}); });
@@ -180,24 +183,32 @@ const driver = {
const currentSql = sqlItems[i]; const currentSql = sqlItems[i];
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
transaction.query(currentSql, function (err, result) { transactionPromise.query(currentSql, function (err, result) {
if (err) return reject(err); if (err) {
logger.error(extractErrorLogData(err), 'Error executing SQL in transaction');
return reject(err);
}
resolve(result); resolve(result);
}); });
}); });
} }
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
transaction.commit(function (err) { transactionPromise.commit(function (err) {
if (err) return reject(err); if (err) {
logger.error(extractErrorLogData(err), 'Error committing transaction');
return reject(err);
}
resolve(); resolve();
}); });
}); });
} catch (error) { } catch (error) {
logger.error(extractErrorLogData(error), 'Transaction error');
if (transactionPromise) { if (transactionPromise) {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
transactionPromise.rollback(function (rollbackErr) { transactionPromise.rollback(function (rollbackErr) {
if (rollbackErr) { if (rollbackErr) {
logger.error(extractErrorLogData(rollbackErr), 'Error rolling back transaction');
return reject(rollbackErr); // Re-reject the rollback error return reject(rollbackErr); // Re-reject the rollback error
} }
resolve(); resolve();
@@ -205,6 +216,8 @@ const driver = {
}); });
} }
} }
return transactionPromise;
}, },
}; };