From 52737ec69431077c53f5a3aa843ba45c210d0580 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Feb 2018 03:46:29 -0500 Subject: [PATCH] Set locking_mode=EXCLUSIVE only for main database in Zotero.DBConnection Otherwise attached databases are also exclusive --- chrome/content/zotero/xpcom/db.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js index 9450881d4..f2a095c4e 100644 --- a/chrome/content/zotero/xpcom/db.js +++ b/chrome/content/zotero/xpcom/db.js @@ -879,7 +879,7 @@ Zotero.DBConnection.prototype.vacuum = function () { // TEMP Zotero.DBConnection.prototype.info = Zotero.Promise.coroutine(function* () { var info = {}; - var pragmas = ['auto_vacuum', 'cache_size', 'locking_mode', 'page_size']; + var pragmas = ['auto_vacuum', 'cache_size', 'main.locking_mode', 'page_size']; for (let p of pragmas) { info[p] = yield Zotero.DB.valueQueryAsync(`PRAGMA ${p}`); } @@ -1038,7 +1038,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function // the lock is lost try { if (DB_LOCK_EXCLUSIVE) { - yield this.queryAsync("PRAGMA locking_mode=NORMAL", false, { inBackup: true }); + yield this.queryAsync("PRAGMA main.locking_mode=NORMAL", false, { inBackup: true }); } storageService.backupDatabaseFile(file, OS.Path.basename(tmpFile), file.parent); } @@ -1049,7 +1049,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function } finally { if (DB_LOCK_EXCLUSIVE) { - yield this.queryAsync("PRAGMA locking_mode=EXCLUSIVE", false, { inBackup: true }); + yield this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE", false, { inBackup: true }); } } @@ -1288,10 +1288,10 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun } if (DB_LOCK_EXCLUSIVE) { - yield this.queryAsync("PRAGMA locking_mode=EXCLUSIVE"); + yield this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE"); } else { - yield this.queryAsync("PRAGMA locking_mode=NORMAL"); + yield this.queryAsync("PRAGMA main.locking_mode=NORMAL"); } // Set page cache size to 8MB