www

commit b56dcf5fbe758782196c1c680b53d619e3ae13aa
parent 05d1fba3683206f942f0b461dd7f5ee5bcd92785
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 23 May 2006 14:50:58 +0000

Added more helpful error messages in DB class

DB transactions are now automatically nested if beginTransaction() is called when one is already in progress -- the queries aren't committed until the outermost commitTransaction() is called, which is handy for calling methods with their own transactions inside others when the entire process should be a transaction (e.g. Folder.erase() calling Item.erase() for the folder's descendents). Rollbacks are a little trickier -- currently, a rollback in a nested transaction flags the entire transaction for rollback when the outermost commit is reached, which for our purposes will probably be fine.


Diffstat:
M
chrome/chromeFiles/content/scholar/db.js
 | 
45
+++++++++++++++++++++++++++++++++++++--------

1 file changed, 37 insertions(+), 8 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/db.js b/chrome/chromeFiles/content/scholar/db.js
@@ -4,6 +4,8 @@
 Scholar.DB = new function(){
 	// Private members
 	var _connection;
+	var _transactionRollback;
+	var _transactionNestingLevel = 0;
 	
 	// Privileged methods
 	this.query = query;
@@ -85,7 +87,7 @@ Scholar.DB = new function(){
 			}
 		}
 		catch (e){
-			throw(e + ' (SQL error: ' + db.lastErrorString + ')');
+			throw(e + ' [QUERY: ' + sql + '] [ERROR: ' + db.lastErrorString + ']');
 		}
 	}
 	
@@ -161,7 +163,7 @@ Scholar.DB = new function(){
 			var statement = db.createStatement(sql);
 		}
 		catch (e){
-			throw(db.lastErrorString);
+			throw('[QUERY: ' + sql + '] [ERROR: ' + db.lastErrorString + ']');
 		}
 		
 		if (statement && params){
@@ -184,22 +186,49 @@ Scholar.DB = new function(){
 	
 	function beginTransaction(){
 		var db = _getDBConnection();
-		Scholar.debug('Beginning DB transaction',5);
-		db.beginTransaction();
+		
+		if (db.transactionInProgress){
+			_transactionNestingLevel++;
+			Scholar.debug('Transaction in progress -- increasing level to '
+				+ _transactionNestingLevel, 5);
+		}
+		else {
+			Scholar.debug('Beginning DB transaction', 5);
+			db.beginTransaction();
+		}
 	}
 	
 	
 	function commitTransaction(){
 		var db = _getDBConnection();
-		Scholar.debug('Committing transaction',5);
-		db.commitTransaction();
+		
+		if (_transactionNestingLevel){
+			_transactionNestingLevel--;
+			Scholar.debug('Decreasing transaction level to ' + _transactionNestingLevel, 5);
+		}
+		else if (_transactionRollback){
+			Scholar.debug('Rolling back previously flagged transaction', 5);
+			db.rollbackTransaction();
+		}
+		else {
+			Scholar.debug('Committing transaction',5);
+			db.commitTransaction();
+		}
 	}
 	
 	
 	function rollbackTransaction(){
 		var db = _getDBConnection();
-		Scholar.debug('Rolling back transaction',5);
-		db.rollbackTransaction();
+		
+		if (_transactionNestingLevel){
+			Scholar.debug('Flagging nested transaction for rollback', 5);
+			_transactionRollback = true;
+		}
+		else {
+			Scholar.debug('Rolling back transaction', 5);
+			_transactionRollback = false;
+			db.rollbackTransaction();
+		}
 	}