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

Get connection without yielding if available in executeTransaction

Browse Source
This commit is contained in:
Dan Stillman 2015-05-10 02:54:38 -04:00
parent a39a42546f
commit af7da366c9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chrome/content/zotero/xpcom/db.js
View File

@ -501,7 +501,7 @@ Zotero.DBConnection.prototype.executeTransaction = Zotero.Promise.coroutine(func
this._callbacks.begin[i]();
}
}
var conn = yield this._getConnectionAsync(options);
var conn = this._getConnection(options) || (yield this._getConnectionAsync(options));
var result = yield conn.executeTransaction(func);
Zotero.debug("Committed async DB transaction", 5);
this._inTransaction = false;
@ -1111,6 +1111,16 @@ Zotero.DBConnection.prototype.getSQLDataType = function(value) {
//
/////////////////////////////////////////////////////////////////
Zotero.DBConnection.prototype._getConnection = function (options) {
if (this._backupPromise && this._backupPromise.isPending() && (!options || !options.inBackup)) {
return false;
}
if (this._connectionAsync === false) {
throw new Error("Database permanently closed; not re-opening");
}
return this._connectionAsync || false;
}
/*
* Retrieve a link to the data store asynchronously
*/