diff --git a/src/becca/entities/note.js b/src/becca/entities/note.js index 0a945bf0f..662a0ba78 100644 --- a/src/becca/entities/note.js +++ b/src/becca/entities/note.js @@ -9,7 +9,6 @@ const entityChangesService = require('../../services/entity_changes'); const AbstractEntity = require("./abstract_entity"); const NoteRevision = require("./note_revision"); const TaskContext = require("../../services/task_context"); -const handlers = require("../../services/handlers"); const LABEL = 'label'; const RELATION = 'relation'; @@ -1143,6 +1142,7 @@ class Note extends AbstractEntity { } // needs to be run before branches and attributes are deleted and thus attached relations disappear + const handlers = require("../../services/handlers"); handlers.runAttachedRelations(this, 'runOnNoteDeletion', this); taskContext.noteDeletionHandlerTriggered = true; diff --git a/src/services/migration.js b/src/services/migration.js index e7306a7d0..423c87cf1 100644 --- a/src/services/migration.js +++ b/src/services/migration.js @@ -102,7 +102,7 @@ function isDbUpToDate() { async function migrateIfNecessary() { const currentDbVersion = getDbVersion(); - if (currentDbVersion > appInfo.dbVersion) { + if (currentDbVersion > appInfo.dbVersion && process.env.TRILIUM_IGNORE_DB_VERSION !== 'true') { log.error(`Current DB version ${currentDbVersion} is newer than app db version ${appInfo.dbVersion} which means that it was created by newer and incompatible version of Trilium. Upgrade to latest version of Trilium to resolve this issue.`); utils.crash();