Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 19:05:59 +01:00
Code Issues Packages Projects Releases Activity

make sure the CLS entity changes are cleared after roll backed transaction, #1736

Browse Source
This commit is contained in:
zadam
2021-03-12 23:48:14 +01:00
parent 9fd26a9b9f
commit 88d04772c4
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/services/sql.js
View File

@@ -3,6 +3,7 @@
const log = require('./log');
const Database = require('better-sqlite3');
const dataDir = require('./data_dir');
const cls = require('./cls');
const dbConnection = new Database(dataDir.DOCUMENT_PATH);
dbConnection.pragma('journal_mode = WAL');
@@ -229,13 +230,20 @@ function wrap(query, func) {
}
function transactional(func) {
const ret = dbConnection.transaction(func).deferred();
try {
const ret = dbConnection.transaction(func).deferred();
if (!dbConnection.inTransaction) { // i.e. transaction was really committed (and not just savepoint released)
require('./ws.js').sendTransactionSyncsToAllClients();
if (!dbConnection.inTransaction) { // i.e. transaction was really committed (and not just savepoint released)
require('./ws.js').sendTransactionSyncsToAllClients();
}
return ret;
}
catch (e) {
cls.clearEntityChanges();
return ret;
throw e;
}
}
function fillNoteIdList(noteIds, truncate = true) {