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

added sourceId to sync, fixes to sync etc.

Browse Source
This commit is contained in:
azivner
2017-10-31 00:15:49 -04:00
parent d88d562d63
commit 43940f1140
8 changed files with 107 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/sql.js
View File

@@ -3,6 +3,7 @@
const db = require('sqlite');
const utils = require('./utils');
const log = require('./log');
const SOURCE_ID = require('./source_id');
async function insert(table_name, rec, replace = false) {
const keys = Object.keys(rec);
@@ -123,8 +124,32 @@ async function deleteRecentAudits(category, req, noteId) {
[category, browserId, noteId, deleteCutoff])
}
async function addNoteSync(noteId, sourceId) {
await addEntitySync("notes", noteId, sourceId)
}
async function addNoteTreeSync(noteId, sourceId) {
await addEntitySync("notes_tree", noteId, sourceId)
}
async function addNoteHistorySync(noteHistoryId, sourceId) {
await addEntitySync("notes_history", noteHistoryId, sourceId);
}
async function addEntitySync(entityName, entityId, sourceId) {
await replace("sync", {
entity_name: entityName,
entity_id: entityId,
sync_date: utils.nowTimestamp(),
source_id: sourceId || SOURCE_ID
});
}
async function doInTransaction(func) {
const error = new Error(); // to capture correct stack trace in case of exception
try {
await beginTransaction();
await func();
@@ -132,9 +157,11 @@ async function doInTransaction(func) {
await commit();
}
catch (e) {
log.error("Error executing transaction, executing rollback. Inner exception: " + e.stack);
log.error("Error executing transaction, executing rollback. Inner exception: " + e.stack + error.stack);
await rollback();
throw e;
}
}
@@ -153,5 +180,8 @@ module.exports = {
addAudit,
deleteRecentAudits,
remove,
doInTransaction
doInTransaction,
addNoteSync,
addNoteTreeSync,
addNoteHistorySync
};