Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 01:36:24 +01:00
Code Issues Packages Projects Releases Activity

note and note_content has been needlesly updated when utcDateModified has been the same

Browse Source
This commit is contained in:
zadam
2019-11-13 22:33:19 +01:00
parent 8b320bb85f
commit c0eb30472e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/sync_update.js
View File

@@ -53,7 +53,7 @@ async function updateEntity(sync, entity, sourceId) {
async function updateNote(entity, sourceId) { async function updateNote(entity, sourceId) {
const origNote = await sql.getRow("SELECT * FROM notes WHERE noteId = ?", [entity.noteId]); const origNote = await sql.getRow("SELECT * FROM notes WHERE noteId = ?", [entity.noteId]);
if (!origNote || origNote.utcDateModified <= entity.utcDateModified) { if (!origNote || origNote.utcDateModified < entity.utcDateModified) {
await sql.transactional(async () => { await sql.transactional(async () => {
await sql.replace("notes", entity); await sql.replace("notes", entity);
@@ -67,7 +67,7 @@ async function updateNote(entity, sourceId) {
async function updateNoteContent(entity, sourceId) { async function updateNoteContent(entity, sourceId) {
const origNoteContent = await sql.getRow("SELECT * FROM note_contents WHERE noteId = ?", [entity.noteId]); const origNoteContent = await sql.getRow("SELECT * FROM note_contents WHERE noteId = ?", [entity.noteId]);
if (!origNoteContent || origNoteContent.utcDateModified <= entity.utcDateModified) { if (!origNoteContent || origNoteContent.utcDateModified < entity.utcDateModified) {
entity.content = entity.content === null ? null : Buffer.from(entity.content, 'base64'); entity.content = entity.content === null ? null : Buffer.from(entity.content, 'base64');
await sql.transactional(async () => { await sql.transactional(async () => {