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 1 Packages Projects Releases Wiki Activity

better error condition checks

Browse Source
This commit is contained in:
zadam 2023-09-19 23:48:55 +02:00
parent 8075265753
commit bc6be44b19
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/sql.js
View File

@ -26,7 +26,7 @@ const LOG_ALL_QUERIES = false;
}); });
function insert(tableName, rec, replace = false) { function insert(tableName, rec, replace = false) {
const keys = Object.keys(rec); const keys = Object.keys(rec || {});
if (keys.length === 0) { if (keys.length === 0) {
log.error(`Can't insert empty object into table ${tableName}`); log.error(`Can't insert empty object into table ${tableName}`);
return; return;
@ -53,7 +53,7 @@ function replace(tableName, rec) {
} }
function upsert(tableName, primaryKey, rec) { function upsert(tableName, primaryKey, rec) {
const keys = Object.keys(rec); const keys = Object.keys(rec || {});
if (keys.length === 0) { if (keys.length === 0) {
log.error(`Can't upsert empty object into table ${tableName}`); log.error(`Can't upsert empty object into table ${tableName}`);
return; return;

4
src/services/sync_update.js
View File

@ -59,6 +59,10 @@ function updateNormalEntity(remoteEC, remoteEntityRow, instanceId) {
} }
} }
if (!remoteEntityRow) {
throw new Error(`Empty entity row for: ${JSON.stringify(remoteEC)}`);
}
sql.replace(remoteEC.entityName, remoteEntityRow); sql.replace(remoteEC.entityName, remoteEntityRow);
if (!localEC || localEC.utcDateChanged < remoteEC.utcDateChanged) { if (!localEC || localEC.utcDateChanged < remoteEC.utcDateChanged) {