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

fix links table reference

Browse Source
This commit is contained in:
zadam 2019-06-09 11:16:00 +02:00
parent 4cacd1dfa2
commit 69e48ff4d7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/link.js
View File

@ -19,7 +19,7 @@ const dateUtils = require('../services/date_utils');
* @extends Entity * @extends Entity
*/ */
class Link extends Entity { class Link extends Entity {
static get entityName() { return "link_map.js"; } static get entityName() { return "links"; }
static get primaryKeyName() { return "linkId"; } static get primaryKeyName() { return "linkId"; }
static get hashedProperties() { return ["linkId", "noteId", "targetNoteId", "type", "isDeleted", "utcDateCreated", "utcDateModified"]; } static get hashedProperties() { return ["linkId", "noteId", "targetNoteId", "type", "isDeleted", "utcDateCreated", "utcDateModified"]; }

4
src/services/sync_table.js
View File

@ -33,7 +33,7 @@ async function addRecentNoteSync(noteId, sourceId) {
} }
async function addLinkSync(linkId, sourceId) { async function addLinkSync(linkId, sourceId) {
await addEntitySync("link_map.js", linkId, sourceId); await addEntitySync("links", linkId, sourceId);
} }
async function addAttributeSync(attributeId, sourceId) { async function addAttributeSync(attributeId, sourceId) {
@ -101,7 +101,7 @@ async function fillAllSyncRows() {
await fillSyncRows("recent_notes", "noteId"); await fillSyncRows("recent_notes", "noteId");
await fillSyncRows("attributes", "attributeId"); await fillSyncRows("attributes", "attributeId");
await fillSyncRows("api_tokens", "apiTokenId"); await fillSyncRows("api_tokens", "apiTokenId");
await fillSyncRows("link_map.js", "linkId"); await fillSyncRows("links", "linkId");
await fillSyncRows("options", "name", 'isSynced = 1'); await fillSyncRows("options", "name", 'isSynced = 1');
} }

4
src/services/sync_update.js
View File

@ -28,7 +28,7 @@ async function updateEntity(sync, entity, sourceId) {
else if (entityName === 'recent_notes') { else if (entityName === 'recent_notes') {
await updateRecentNotes(entity, sourceId); await updateRecentNotes(entity, sourceId);
} }
else if (entityName === 'link_map.js') { else if (entityName === 'links') {
await updateLink(entity, sourceId); await updateLink(entity, sourceId);
} }
else if (entityName === 'attributes') { else if (entityName === 'attributes') {
@ -164,7 +164,7 @@ async function updateLink(entity, sourceId) {
if (!origLink || origLink.utcDateModified <= entity.utcDateModified) { if (!origLink || origLink.utcDateModified <= entity.utcDateModified) {
await sql.transactional(async () => { await sql.transactional(async () => {
await sql.replace("link_map.js", entity); await sql.replace("links", entity);
await syncTableService.addLinkSync(entity.linkId, sourceId); await syncTableService.addLinkSync(entity.linkId, sourceId);
}); });