Restore proper incompatible DB message

Fixes zotero#1446
Juris-M · Apr 15, 2018 · 306b971 · 306b971
1 parent 973555d
commit 306b971
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -1657,8 +1657,13 @@ Zotero.Schema = new function(){
 			return false;
 		}
 		if (dbVersion > schemaVersion) {
-			throw new Error("Zotero '" + schema + "' DB version (" + dbVersion
-				+ ") is newer than SQL file (" + schemaVersion + ")");
+			let dbClientVersion = yield Zotero.DB.valueQueryAsync(
+				"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
+			);
 		}
 		var sql = yield _getSchemaSQL(schema);
 		yield Zotero.DB.executeSQLFile(sql);