gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

attribute sync fixes

Browse Source
This commit is contained in:
azivner 2018-01-13 23:33:09 -05:00
parent 359ff58be8
commit 45a92313d5
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/content_hash.js
View File

@ -80,7 +80,18 @@ async function getHashes() {
date_modified, date_modified,
date_created date_created
FROM images FROM images
ORDER BY image_id`)) ORDER BY image_id`)),
attributes: getHash(await sql.getAll(`
SELECT
attribute_id,
note_id
name,
value
date_modified,
date_created
FROM attributes
ORDER BY attribute_id`))
}; };
const elapseTimeMs = new Date().getTime() - startTime.getTime(); const elapseTimeMs = new Date().getTime() - startTime.getTime();

4
services/sync_update.js
View File

@ -124,11 +124,11 @@ async function updateNoteImage(entity, sourceId) {
} }
async function updateAttribute(entity, sourceId) { async function updateAttribute(entity, sourceId) {
const origAttribute = await sql.getFirst("SELECT * FROM attribute WHERE attribute_id = ?", [entity.attribute_id]); const origAttribute = await sql.getFirst("SELECT * FROM attributes WHERE attribute_id = ?", [entity.attribute_id]);
if (!origAttribute || origAttribute.date_modified <= entity.date_modified) { if (!origAttribute || origAttribute.date_modified <= entity.date_modified) {
await sql.doInTransaction(async () => { await sql.doInTransaction(async () => {
await sql.replace("attribute", entity); await sql.replace("attributes", entity);
await sync_table.addAttributeSync(entity.attribute_id, sourceId); await sync_table.addAttributeSync(entity.attribute_id, sourceId);
}); });