self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

All: Fixes #3088: Better handling of missing table field bug on Linux

Browse Source
This commit is contained in:
Laurent Cozic 2020-04-19 16:02:10 +01:00
parent e598c64241
commit d730e068b0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ReactNativeClient/lib/joplin-database.js
View File

@ -251,7 +251,7 @@ class JoplinDatabase extends Database {
return d && d[fieldName] ? d[fieldName] : ''; return d && d[fieldName] ? d[fieldName] : '';
} }
refreshTableFields() { refreshTableFields(newVersion) {
this.logger().info('Initializing tables...'); this.logger().info('Initializing tables...');
const queries = []; const queries = [];
queries.push(this.wrapQuery('DELETE FROM table_fields')); queries.push(this.wrapQuery('DELETE FROM table_fields'));
@ -289,6 +289,7 @@ class JoplinDatabase extends Database {
return promiseChain(chain); return promiseChain(chain);
}) })
.then(() => { .then(() => {
queries.push({ sql: 'UPDATE version SET table_fields_version = ?', params: [newVersion] });
return this.transactionExecBatch(queries); return this.transactionExecBatch(queries);
}); });
} }
@ -313,7 +314,7 @@ class JoplinDatabase extends Database {
// must be set in the synchronizer too. // must be set in the synchronizer too.
// Note: v16 and v17 don't do anything. They were used to debug an issue. // Note: v16 and v17 don't do anything. They were used to debug an issue.
const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28]; const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29];
let currentVersionIndex = existingDatabaseVersions.indexOf(fromVersion); let currentVersionIndex = existingDatabaseVersions.indexOf(fromVersion);
@ -681,6 +682,10 @@ class JoplinDatabase extends Database {
queries.push('CREATE INDEX resources_size ON resources(size)'); queries.push('CREATE INDEX resources_size ON resources(size)');
} }
if (targetVersion == 29) {
queries.push('ALTER TABLE version ADD COLUMN table_fields_version INT NOT NULL DEFAULT 0');
}
queries.push({ sql: 'UPDATE version SET version = ?', params: [targetVersion] }); queries.push({ sql: 'UPDATE version SET version = ?', params: [targetVersion] });
try { try {
@ -734,12 +739,13 @@ class JoplinDatabase extends Database {
} }
const version = !versionRow ? 0 : versionRow.version; const version = !versionRow ? 0 : versionRow.version;
const tableFieldsVersion = !versionRow ? 0 : versionRow.table_fields_version;
this.version_ = version; this.version_ = version;
this.logger().info('Current database version', version); this.logger().info('Current database version', version);
const newVersion = await this.upgradeDatabase(version); const newVersion = await this.upgradeDatabase(version);
this.version_ = newVersion; this.version_ = newVersion;
if (newVersion !== version) await this.refreshTableFields(); if (newVersion !== tableFieldsVersion) await this.refreshTableFields(newVersion);
this.tableFields_ = {}; this.tableFields_ = {};