From f5e27278ab2a38484019ee2510781099b60ec2b6 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 15 Mar 2020 11:19:30 +0100 Subject: [PATCH 1/2] fix migration script to preserve sync IDs --- db/migrations/0158__add_isSynced_to_sync.sql | 16 ++++++++-------- db/schema.sql | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/db/migrations/0158__add_isSynced_to_sync.sql b/db/migrations/0158__add_isSynced_to_sync.sql index a2d978bc1..647815f98 100644 --- a/db/migrations/0158__add_isSynced_to_sync.sql +++ b/db/migrations/0158__add_isSynced_to_sync.sql @@ -1,13 +1,13 @@ 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); + `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; +INSERT INTO sync_mig (id, entityName, entityId, sourceId, isSynced, utcSyncDate) +SELECT id, entityName, entityId, sourceId, 1, utcSyncDate FROM sync; DROP TABLE sync; diff --git a/db/schema.sql b/db/schema.sql index 8c766571f..f5024a097 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -3,8 +3,6 @@ CREATE TABLE IF NOT EXISTS "source_ids" ( `utcDateCreated` TEXT NOT NULL, PRIMARY KEY(`sourceId`) ); -CREATE INDEX IDX_source_ids_utcDateCreated - on source_ids (utcDateCreated); CREATE TABLE IF NOT EXISTS "api_tokens" ( apiTokenId TEXT PRIMARY KEY NOT NULL, @@ -59,6 +57,8 @@ CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCr CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`); CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`); CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`); +CREATE INDEX IDX_source_ids_utcDateCreated + on source_ids (utcDateCreated); CREATE TABLE IF NOT EXISTS "notes" ( `noteId` TEXT NOT NULL, `title` TEXT NOT NULL DEFAULT "note", From a717ee00fbe10c4c4562057114db5a08f18725ba Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 15 Mar 2020 11:21:43 +0100 Subject: [PATCH 2/2] release 0.40.6 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 98e0488a5..7db44d6f6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.40.5", + "version": "0.40.6", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 7ed5b250e..a18feefb1 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2020-03-08T21:05:52+01:00", buildRevision: "e4039ea5e1c6ac87e0947bc77b6bdcbb29a23092" }; +module.exports = { buildDate:"2020-03-15T11:21:43+01:00", buildRevision: "f5e27278ab2a38484019ee2510781099b60ec2b6" };