Merge remote-tracking branch 'origin/stable'

db/migrations/0158__add_isSynced_to_sync.sql

@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "sync_mig" (
+    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `entityName`	TEXT NOT NULL,
+    `entityId`	TEXT NOT NULL,
+    `sourceId` TEXT NOT NULL,
+    `isSynced` INTEGER default 0 not null,
+    `utcSyncDate`	TEXT NOT NULL);
+
+INSERT INTO sync_mig (entityName, entityId, sourceId, isSynced, utcSyncDate)
+SELECT entityName, entityId, sourceId, 1, utcSyncDate FROM sync;
+
+DROP TABLE sync;
+
+ALTER TABLE sync_mig RENAME TO sync;
+
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+                                                              `entityName`,
+                                                              `entityId`
+    );
+CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
+                                               `utcSyncDate`
+    );

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.40.4",
+  "version": "0.40.5",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {

src/routes/api/app_info.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const app_info = require('../../services/app_info');
+const appInfo = require('../../services/app_info');
 
 async function getAppInfo() {
-    return app_info;
+    return appInfo;
 }
 
 module.exports = {

src/services/app_info.js

@@ -4,7 +4,7 @@ const build = require('./build');
 const packageJson = require('../../package');
 const {TRILIUM_DATA_DIR} = require('./data_dir');
 
-const APP_DB_VERSION = 157;
+const APP_DB_VERSION = 158;
 const SYNC_VERSION = 14;
 const CLIPPER_PROTOCOL_VERSION = "1.0";
 

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2020-02-24T22:59:22+01:00", buildRevision: "fb55cdaea6b1367129e11118b8b6fd2eadebad5f" };
+module.exports = { buildDate:"2020-03-08T21:05:52+01:00", buildRevision: "e4039ea5e1c6ac87e0947bc77b6bdcbb29a23092" };

src/services/consistency_checks.js

@@ -546,7 +546,7 @@ class ConsistencyChecks {
           ${entityName} 
           LEFT JOIN sync ON sync.entityName = '${entityName}' AND entityId = ${key} 
         WHERE 
-          sync.id IS NULL AND ` + (entityName === 'options' ? 'isSynced = 1' : '1'),
+          sync.id IS NULL AND ` + (entityName === 'options' ? 'options.isSynced = 1' : '1'),
             async ({entityId}) => {
                 if (this.autoFix) {
                     await syncTableService.addEntitySync(entityName, entityId);

src/services/sync_table.js

@@ -9,7 +9,8 @@ async function insertEntitySync(entityName, entityId, sourceId) {
         entityName: entityName,
         entityId: entityId,
         utcSyncDate: dateUtils.utcNowDateTime(),
-        sourceId: sourceId || cls.getSourceId() || sourceIdService.getCurrentSourceId()
+        sourceId: sourceId || cls.getSourceId() || sourceIdService.getCurrentSourceId(),
+        isSynced: 1
     };
 
     sync.id = await sql.replace("sync", sync);