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

Allow nested database transactions within the same wait level and disallow database access from higher levels

Browse source
This commit is contained in:
Dan Stillman 2011-08-30 01:05:12 +00:00
parent 3c02f0b0e6
commit 16a3d3f1ed
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

@ -65,6 +65,7 @@ Zotero.DBConnection = function(dbName) {
this._lastTransactionDate = null;
this._transactionRollback = null;
this._transactionNestingLevel = 0;
this._transactionWaitLevel = 0;
this._callbacks = { begin: [], commit: [], rollback: [] };
this._dbIsCorrupt = null
this._self = this;
@ -223,8 +224,8 @@ Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams)
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");
if (db.transactionInProgress && Zotero.waiting > this._transactionWaitLevel) {
throw ("Cannot access database layer from a higher wait level if a transaction is open");
}
// First, determine the type of query using first word
@ -426,8 +427,8 @@ Zotero.DBConnection.prototype.beginTransaction = function () {
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";
if (Zotero.waiting != this._transactionWaitLevel) {
var msg = "Cannot start a DB transaction from a different wait level";
Zotero.debug(msg, 2);
throw (msg);
}
@ -437,6 +438,8 @@ Zotero.DBConnection.prototype.beginTransaction = function () {
+ this._transactionNestingLevel, 5);
}
else {
this._transactionWaitLevel = Zotero.waiting;
this._debug('Beginning DB transaction', 5);
db.beginTransaction();