suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore proper incompatible DB message

Browse Source 
Fixes #1446
This commit is contained in:
Dan Stillman 2018-04-14 11:38:54 -04:00
parent 0e3071576b
commit 0cc3e64b8a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chrome/content/zotero/xpcom/schema.js
View File

@ -1549,8 +1549,13 @@ Zotero.Schema = new function(){
return false; return false;
} }
if (dbVersion > schemaVersion) { if (dbVersion > schemaVersion) {
throw new Error("Zotero '" + schema + "' DB version (" + dbVersion let dbClientVersion = yield Zotero.DB.valueQueryAsync(
+ ") is newer than SQL file (" + schemaVersion + ")"); "SELECT value FROM settings WHERE setting='client' AND key='lastCompatibleVersion'"
);
throw new Zotero.DB.IncompatibleVersionException(
`Zotero '${schema}' DB version (${dbVersion}) is newer than SQL file (${schemaVersion})`,
dbClientVersion
);
} }
let sql = yield _getSchemaSQL(schema); let sql = yield _getSchemaSQL(schema);
yield Zotero.DB.executeSQLFile(sql); yield Zotero.DB.executeSQLFile(sql);