From a3149aecf41bac3c559ebbd1865e916264985ac3 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 17 Jan 2023 23:13:21 +0100 Subject: [PATCH] fix migration for DBs which did not have _hidden tree created, closes #3536 --- db/migrations/0200__create_hidden_subtree.js | 2 +- src/services/hidden_subtree.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/migrations/0200__create_hidden_subtree.js b/db/migrations/0200__create_hidden_subtree.js index e074e8ff7..6d283d715 100644 --- a/db/migrations/0200__create_hidden_subtree.js +++ b/db/migrations/0200__create_hidden_subtree.js @@ -7,6 +7,6 @@ module.exports = () => { beccaLoader.load(); // make sure the hidden subtree exists since the subsequent migrations we will move some existing notes into it (share...) // in previous releases hidden subtree was created lazily - hiddenSubtreeService.checkHiddenSubtree(); + hiddenSubtreeService.checkHiddenSubtree(true); }); }; diff --git a/src/services/hidden_subtree.js b/src/services/hidden_subtree.js index df3bbc984..263ca5f93 100644 --- a/src/services/hidden_subtree.js +++ b/src/services/hidden_subtree.js @@ -234,8 +234,8 @@ const HIDDEN_SUBTREE_DEFINITION = { ] }; -function checkHiddenSubtree() { - if (!migrationService.isDbUpToDate()) { +function checkHiddenSubtree(force = false) { + if (!force && !migrationService.isDbUpToDate()) { // on-delete hook might get triggered during some future migration and cause havoc log.info("Will not check hidden subtree until migration is finished."); return;