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

improve sync debug info

Browse Source
This commit is contained in:
zadam 2023-11-04 00:02:31 +01:00
parent d3a477b8f2
commit df5951ce46
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/services/sync.js
View File

@ -292,7 +292,9 @@ async function syncRequest(syncContext, method, requestPath, body) {
return response; return response;
} }
function getEntityChangeRow(entityName, entityId) { function getEntityChangeRow(entityChange) {
const {entityName, entityId} = entityChange;
if (entityName === 'note_reordering') { if (entityName === 'note_reordering') {
return sql.getMap("SELECT branchId, notePosition FROM branches WHERE parentNoteId = ? AND isDeleted = 0", [entityId]); return sql.getMap("SELECT branchId, notePosition FROM branches WHERE parentNoteId = ? AND isDeleted = 0", [entityId]);
} }
@ -300,13 +302,13 @@ function getEntityChangeRow(entityName, entityId) {
const primaryKey = entityConstructor.getEntityFromEntityName(entityName).primaryKeyName; const primaryKey = entityConstructor.getEntityFromEntityName(entityName).primaryKeyName;
if (!primaryKey) { if (!primaryKey) {
throw new Error(`Unknown entity '${entityName}'`); throw new Error(`Unknown entity for entity change ${JSON.stringify(entityChange)}`);
} }
const entityRow = sql.getRow(`SELECT * FROM ${entityName} WHERE ${primaryKey} = ?`, [entityId]); const entityRow = sql.getRow(`SELECT * FROM ${entityName} WHERE ${primaryKey} = ?`, [entityId]);
if (!entityRow) { if (!entityRow) {
throw new Error(`Entity ${entityName} '${entityId}' not found.`); throw new Error(`Cannot find entity for entity change ${JSON.stringify(entityChange)}`);
} }
if (entityName === 'blobs' && entityRow.content !== null) { if (entityName === 'blobs' && entityRow.content !== null) {
@ -332,7 +334,7 @@ function getEntityChangeRecords(entityChanges) {
continue; continue;
} }
const entity = getEntityChangeRow(entityChange.entityName, entityChange.entityId); const entity = getEntityChangeRow(entityChange);
const record = { entityChange, entity }; const record = { entityChange, entity };