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

sync fixes

Browse Source
This commit is contained in:
zadam
2021-02-11 22:50:32 +01:00
parent 8850de51f5
commit 3d7beefad0
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
db/migrations/0172__migrate_saved_notes.js → db/migrations/0172__migrate_saved_search_notes.js
View File

5
db/migrations/0181__fix_entityChanges_isSynced.sql Normal file
View File

@@ -0,0 +1,5 @@
UPDATE entity_changes SET isSynced = (
SELECT options.isSynced
FROM options
WHERE options.name = entity_changes.entityId
) WHERE entityName = 'options';

2
src/services/app_info.js
View File

@@ -4,7 +4,7 @@ const build = require('./build');
const packageJson = require('../../package'); const packageJson = require('../../package');
const {TRILIUM_DATA_DIR} = require('./data_dir'); const {TRILIUM_DATA_DIR} = require('./data_dir');
const APP_DB_VERSION = 180; const APP_DB_VERSION = 181;
const SYNC_VERSION = 19; const SYNC_VERSION = 19;
const CLIPPER_PROTOCOL_VERSION = "1.0"; const CLIPPER_PROTOCOL_VERSION = "1.0";

13
src/services/sync_update.js
View File

@@ -1,4 +1,5 @@
const sql = require('./sql'); const sql = require('./sql');
const log = require('./log');
const entityChangesService = require('./entity_changes.js'); const entityChangesService = require('./entity_changes.js');
const eventService = require('./events'); const eventService = require('./events');
const entityConstructor = require('../entities/entity_constructor'); const entityConstructor = require('../entities/entity_constructor');
@@ -6,6 +7,18 @@ const entityConstructor = require('../entities/entity_constructor');
function updateEntity(entityChange, entity, sourceId) { function updateEntity(entityChange, entity, sourceId) {
// can be undefined for options with isSynced=false // can be undefined for options with isSynced=false
if (!entity) { if (!entity) {
if (entityChange.isSynced) {
if (entityChange.isErased) {
entityChangesService.addEntityChange(entityChange, sourceId);
}
else {
log.info(`Encountered synced non-erased entity change without entity: ${JSON.stringify(entityChange)}`);
}
}
else if (entityChange.entityName !== 'options') {
log.info(`Encountered unsynced non-option entity change without entity: ${JSON.stringify(entityChange)}`);
}
return; return;
} }