gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 13:39:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

removed id from notes_history, new primary key is note_history_id

Browse Source
This commit is contained in:
azivner 2017-11-02 19:23:52 -04:00
parent 9e3515b122
commit 40e27cd6f7
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
migrations/0023__remove_id_from_note_history.sql Normal file
View File

@ -0,0 +1,27 @@
CREATE TABLE `notes_history_mig` (
`note_history_id` TEXT NOT NULL PRIMARY KEY,
`note_id` TEXT NOT NULL,
`note_title` TEXT,
`note_text` TEXT,
`encryption` INT,
`date_modified_from` INT,
`date_modified_to` INT
);
INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to)
SELECT note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to FROM notes_history;
DROP TABLE notes_history;
ALTER TABLE notes_history_mig RENAME TO notes_history;
CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
`note_id`
);
CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
`date_modified_from`
);
CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
`date_modified_to`
);

2
services/migration.js
View File

@ -3,7 +3,7 @@ const sql = require('./sql');
const fs = require('fs-extra'); const fs = require('fs-extra');
const log = require('./log'); const log = require('./log');
const APP_DB_VERSION = 22; const APP_DB_VERSION = 23;
const MIGRATIONS_DIR = "./migrations"; const MIGRATIONS_DIR = "./migrations";
async function migrate() { async function migrate() {

2
services/sync.js
View File

@ -285,8 +285,6 @@ async function updateNoteHistory(entity, sourceId, syncLog) {
if (orig === null || orig.date_modified_to < entity.date_modified_to) { if (orig === null || orig.date_modified_to < entity.date_modified_to) {
await sql.doInTransaction(async () => { await sql.doInTransaction(async () => {
delete entity['id'];
await sql.replace('notes_history', entity); await sql.replace('notes_history', entity);
await sql.addNoteHistorySync(entity.note_history_id, sourceId); await sql.addNoteHistorySync(entity.note_history_id, sourceId);