gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix direct migration from 0.30 to 0.32, closes #557

Browse Source
This commit is contained in:
zadam 2019-06-05 22:07:12 +02:00
parent b389ec5ea3
commit 19a154c2f4
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/services/sync_table.js
View File

@ -62,26 +62,33 @@ async function cleanupSyncRowsForMissingEntities(entityName, entityKey) {
} }
async function fillSyncRows(entityName, entityKey, condition = '') { async function fillSyncRows(entityName, entityKey, condition = '') {
await cleanupSyncRowsForMissingEntities(entityName, entityKey); try {
await cleanupSyncRowsForMissingEntities(entityName, entityKey);
const entityIds = await sql.getColumn(`SELECT ${entityKey} FROM ${entityName}` const entityIds = await sql.getColumn(`SELECT ${entityKey} FROM ${entityName}`
+ (condition ? ` WHERE ${condition}` : '')); + (condition ? ` WHERE ${condition}` : ''));
for (const entityId of entityIds) { for (const entityId of entityIds) {
const existingRows = await sql.getValue("SELECT COUNT(id) FROM sync WHERE entityName = ? AND entityId = ?", [entityName, entityId]); const existingRows = await sql.getValue("SELECT COUNT(id) FROM sync WHERE entityName = ? AND entityId = ?", [entityName, entityId]);
// we don't want to replace existing entities (which would effectively cause full resync) // we don't want to replace existing entities (which would effectively cause full resync)
if (existingRows === 0) { if (existingRows === 0) {
log.info(`Creating missing sync record for ${entityName} ${entityId}`); log.info(`Creating missing sync record for ${entityName} ${entityId}`);
await sql.insert("sync", { await sql.insert("sync", {
entityName: entityName, entityName: entityName,
entityId: entityId, entityId: entityId,
sourceId: "SYNC_FILL", sourceId: "SYNC_FILL",
utcSyncDate: dateUtils.utcNowDateTime() utcSyncDate: dateUtils.utcNowDateTime()
}); });
}
} }
} }
catch (e) {
// this is to fix migration from 0.30 to 0.32, can be removed later
// see https://github.com/zadam/trilium/issues/557
log.error(`Filling sync rows failed for ${entityName} ${entityKey} with error "${e.message}", continuing`);
}
} }
async function fillAllSyncRows() { async function fillAllSyncRows() {