mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Restore detection of some types of DB corruption at startup

Browse source 
1e0ad3aba changed the test for DB corruption to look for "database disk
image is malformed", but at least Sqlite.openConnection() can throw a
"Could not open connection" error with "2152857611"
(NS_ERROR_FILE_CORRUPTED) in it.
This commit is contained in:
Dan Stillman 2020-07-22 16:14:17 -04:00
parent 785b6dd408
commit 7f92220ef9
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/xpcom/db.js
View file

@ -37,7 +37,10 @@ Zotero.DBConnection = function(dbNameOrPath) {
}
this.MAX_BOUND_PARAMETERS = 999;
this.DB_CORRUPTION_STRING = "database disk image is malformed";
this.DB_CORRUPTION_STRINGS = [
"database disk image is malformed",
"2152857611"
];
Components.utils.import("resource://gre/modules/Sqlite.jsm", this);
@ -870,7 +873,7 @@ Zotero.DBConnection.prototype.integrityCheck = Zotero.Promise.coroutine(function
Zotero.DBConnection.prototype.isCorruptionError = function (e) {
return e.message.includes(this.DB_CORRUPTION_STRING);
return this.DB_CORRUPTION_STRINGS.some(x => e.message.includes(x));
};
@ -1120,7 +1123,7 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function (options) {
try {
if (await OS.File.exists(corruptMarker)) {
throw new Error(this.DB_CORRUPTION_STRING);
throw new Error(this.DB_CORRUPTION_STRINGS[0]);
}
this._connection = await Zotero.Promise.resolve(this.Sqlite.openConnection({
path: file
@ -1134,7 +1137,7 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function (options) {
Zotero.logError(e);
if (e.message.includes(this.DB_CORRUPTION_STRING)) {
if (this.DB_CORRUPTION_STRINGS.some(x => e.message.includes(x))) {
await this._handleCorruptionMarker();
}
else {