Unconditionally decrement transaction depth (#8008)
…otherwise we may end up in a situation where we're always stuck in an "already in a transaction" state and often neglect to actually enter a real transaction!
This commit is contained in:
parent
d7d0733177
commit
de4fe132a7
|
@ -507,6 +507,7 @@ TODO: better-sqlite3 provides its own transaction method which we should be usin
|
|||
SqlTiddlerDatabase.prototype.transaction = function(fn) {
|
||||
const alreadyInTransaction = this.transactionDepth > 0;
|
||||
this.transactionDepth++;
|
||||
try {
|
||||
if(alreadyInTransaction) {
|
||||
return fn();
|
||||
} else {
|
||||
|
@ -517,11 +518,12 @@ SqlTiddlerDatabase.prototype.transaction = function(fn) {
|
|||
} catch(e) {
|
||||
this.runStatement(`ROLLBACK TRANSACTION`);
|
||||
throw(e);
|
||||
} finally {
|
||||
this.transactionDepth--;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
} finally {
|
||||
this.transactionDepth--;
|
||||
}
|
||||
};
|
||||
|
||||
exports.SqlTiddlerDatabase = SqlTiddlerDatabase;
|
||||
|
|
Loading…
Reference in New Issue