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

Block database access during Zotero.wait() only if a transaction is in progress

Browse source
This commit is contained in:
Dan Stillman 2011-08-25 21:03:24 +00:00
parent 291b739b76
commit b27e64f9c8
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -220,13 +220,13 @@ Zotero.DBConnection.prototype.columnQuery = function (sql,params) {
* [1,"hello",3] or [{'int':2},{'string':'foobar'}]
*/
Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams) {
// TODO: limit to Zotero.DB, not all Zotero.DBConnections?
if (Zotero.waiting) {
throw ("Cannot access database layer during active Zotero.wait()");
}
var db = this._getDBConnection();
// TODO: limit to Zotero.DB, not all Zotero.DBConnections?
if (db.transactionInProgress && Zotero.waiting) {
throw ("Cannot access database layer during active Zotero.wait() if a transaction is open");
}
// First, determine the type of query using first word
var matches = sql.match(/^[^\s\(]*/);
var queryMethod = matches[0].toLowerCase();
@ -422,16 +422,16 @@ Zotero.DBConnection.prototype.getLastErrorString = function () {
Zotero.DBConnection.prototype.beginTransaction = function () {
// TODO: limit to Zotero.DB, not all Zotero.DBConnections?
if (Zotero.waiting) {
var msg = "Cannot access database layer during active Zotero.wait()";
Zotero.debug(msg, 2);
throw (msg);
}
var db = this._getDBConnection();
if (db.transactionInProgress) {
// TODO: limit to Zotero.DB, not all Zotero.DBConnections?
if (Zotero.waiting) {
var msg = "Cannot access database layer during active Zotero.wait() if a transaction is in progress";
Zotero.debug(msg, 2);
throw (msg);
}
this._transactionNestingLevel++;
this._debug('Transaction in progress -- increasing level to '
+ this._transactionNestingLevel, 5);