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

fixes

Browse Source
This commit is contained in:
zadam
2019-11-30 11:36:36 +01:00
parent 995ebbf577
commit 67663fba50
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/notes.js
View File

@@ -480,7 +480,7 @@ async function eraseDeletedNotes() {
SET content = NULL, SET content = NULL,
utcDateModified = '${utcNowDateTime}' utcDateModified = '${utcNowDateTime}'
WHERE noteRevisionId IN WHERE noteRevisionId IN
(SELECT noteRevisionId FROM note_revisions WHERE isErased = 0 AND noteId IN ((???)))`, noteIdsToErase); (SELECT noteRevisionId FROM note_revisions WHERE isErased = 0 AND noteId IN (???))`, noteIdsToErase);
await sql.executeMany(` await sql.executeMany(`
UPDATE note_revisions UPDATE note_revisions
@@ -530,7 +530,7 @@ async function duplicateNote(noteId, parentNoteId) {
sqlInit.dbReady.then(() => { sqlInit.dbReady.then(() => {
// first cleanup kickoff 5 minutes after startup // first cleanup kickoff 5 minutes after startup
setTimeout(cls.wrap(eraseDeletedNotes), 5 * 60 * 1000); setTimeout(cls.wrap(eraseDeletedNotes), 0 * 60 * 1000);
setInterval(cls.wrap(eraseDeletedNotes), 4 * 3600 * 1000); setInterval(cls.wrap(eraseDeletedNotes), 4 * 3600 * 1000);
}); });

6
src/services/sql_init.js
View File

@@ -173,9 +173,11 @@ async function isDbUpToDate() {
} }
async function dbInitialized() { async function dbInitialized() {
await optionService.setOption('initialized', 'true'); if (!await isDbInitialized()) {
await optionService.setOption('initialized', 'true');
await initDbConnection(); await initDbConnection();
}
} }
dbReady.then(async () => { dbReady.then(async () => {