mirror of
https://github.com/zadam/trilium.git
synced 2024-09-20 23:55:59 +08:00
fix migration
This commit is contained in:
parent
0758c82983
commit
c177d2b97b
|
@ -1,12 +1,12 @@
|
|||
-- case based on isDeleted is needed, otherwise 2 branches (1 deleted, 1 not) might get the same ID
|
||||
UPDATE entity_changes SET entityId = (
|
||||
UPDATE entity_changes SET entityId = COALESCE((
|
||||
SELECT
|
||||
CASE isDeleted
|
||||
WHEN 0 THEN parentNoteId || '_' || noteId
|
||||
WHEN 1 THEN branchId
|
||||
END
|
||||
FROM branches WHERE branchId = entityId
|
||||
)
|
||||
WHERE entityName = 'branches';
|
||||
), entityId)
|
||||
WHERE entityName = 'branches' AND isErased = 0;
|
||||
|
||||
UPDATE branches SET branchId = parentNoteId || '_' || noteId WHERE isDeleted = 0;
|
||||
|
|
|
@ -62,9 +62,10 @@ async function migrate() {
|
|||
log.info(`Migration to version ${mig.dbVersion} has been successful.`);
|
||||
} catch (e) {
|
||||
log.error(`error during migration to version ${mig.dbVersion}: ${e.stack}`);
|
||||
log.error("migration failed, crashing hard"); // this is not very user friendly :-/
|
||||
log.error("migration failed, crashing hard"); // this is not very user-friendly :-/
|
||||
|
||||
utils.crash();
|
||||
break; // crash() above does not seem to work right away
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue