From a3df0c39e289fa772e71062b32d6eea370a4898c Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 20 Jun 2006 15:42:01 +0000
Subject: [PATCH] - DB parameters can now be bound using the native JS type
 rather than by specifying the type explicitly (e.g. Scholar.DB.query(sql, [1,
 2, "hello"]) -- for use when the data is generated internally and trusted,
 obviously

- Don't try to display an SQLite error when it's "not an error" (i.e. when the error is in something else)

- Switch to nsIFile instead of nsILocalFile to retrieve the profile directory
---
 .../chromeFiles/content/scholar/xpcom/db.js   | 78 +++++++++++++++----
 1 file changed, 62 insertions(+), 16 deletions(-)

diff --git a/chrome/chromeFiles/content/scholar/xpcom/db.js b/chrome/chromeFiles/content/scholar/xpcom/db.js
index 36ba0aab8..b47b630b4 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/db.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/db.js
@@ -31,7 +31,7 @@ Scholar.DB = new function(){
 	 * Run an SQL query
 	 *
 	 *  Optional _params_ is an array of bind parameters in the form
-	 *		[{'int':2},{'string':'foobar'}]
+	 *		[1,"hello",3] or [{'int':2},{'string':'foobar'}]
 	 *
 	 * 	Returns:
 	 *  	 - Associative array (similar to mysql_fetch_assoc) for SELECT's
@@ -89,7 +89,9 @@ Scholar.DB = new function(){
 			}
 		}
 		catch (e){
-			throw(e + ' [QUERY: ' + sql + '] [ERROR: ' + db.lastErrorString + ']');
+			var dberr = (db.lastErrorString!='not an error')
+				? ' [ERROR: ' + db.lastErrorString + ']' : '';
+			throw(e + ' [QUERY: ' + sql + ']' + dberr);
 		}
 	}
 	
@@ -151,7 +153,7 @@ Scholar.DB = new function(){
 	 * Run a query, returning a mozIStorageStatement for direct manipulation
 	 *
 	 *  Optional _params_ is an array of bind parameters in the form
-	 *		[{'int':2},{'string':'foobar'}]
+	 *		[1,"hello",3] or [{'int':2},{'string':'foobar'}]
 	 */
 	function statementQuery(sql,params){
 		var db = _getDBConnection();
@@ -161,27 +163,67 @@ Scholar.DB = new function(){
 			var statement = db.createStatement(sql);
 		}
 		catch (e){
-			throw('[QUERY: ' + sql + '] [ERROR: ' + db.lastErrorString + ']');
+			var dberr = (db.lastErrorString!='not an error')
+				? ' [ERROR: ' + db.lastErrorString + ']' : '';
+			throw(e + ' [QUERY: ' + sql + ']' + dberr);
 		}
 		
 		if (statement && params){
 			for (var i=0; i<params.length; i++){
-				// Int
+				// Integer
 				if (typeof params[i]['int'] != 'undefined'){
-					Scholar.debug('Binding parameter ' + (i+1) + ' of type int: ' +
-						params[i]['int'],5);
-					statement.bindInt32Parameter(i,params[i]['int']);
+					var type = 'int';
+					var value = params[i]['int'];
 				}
 				// String
 				else if (typeof params[i]['string'] != 'undefined'){
-					Scholar.debug('Binding parameter ' + (i+1) + ' of type string: "' +
-						params[i]['string'] + '"',5);
-					statement.bindUTF8StringParameter(i,params[i]['string']);
+					var type = 'string';
+					var value = params[i]['string'];
 				}
 				// Null
 				else if (typeof params[i]['null'] != 'undefined'){
-					Scholar.debug('Binding parameter ' + (i+1) + ' of type NULL', 5);
-					statement.bindNullParameter(i);
+					var type = 'null';
+				}
+				// Automatic (trust the JS type)
+				else {
+					switch (typeof params[i]){
+						case 'string':
+							var type = 'string';
+							break;
+						case 'number':
+							var type = 'int';
+							break;
+						// Object
+						default:
+							// Null value will show as object
+							if (!params[i]){
+								var type = 'null';
+							}
+							else {
+								throw('Invalid bound parameter ' + params[i]);
+							}
+					}
+					var value = params[i];
+				}
+				
+				// Bind the parameter as the correct type
+				switch (type){
+					case 'int':
+						Scholar.debug('Binding parameter ' + (i+1)
+							+ ' of type int: ' + value, 5);
+						statement.bindInt32Parameter(i, value);
+						break;
+						
+					case 'string':
+						Scholar.debug('Binding parameter ' + (i+1)
+							+ ' of type string: "' + value + '"', 5);
+						statement.bindUTF8StringParameter(i, value);
+						break;
+						
+					case 'null':
+						Scholar.debug('Binding parameter ' + (i+1)
+							+ ' of type NULL', 5);
+						statement.bindNullParameter(i);
 				}
 			}
 		}
@@ -221,7 +263,9 @@ Scholar.DB = new function(){
 				db.commitTransaction();
 			}
 			catch(e){
-				throw(e + ' [ERROR: ' + db.lastErrorString + ']');
+				var dberr = (db.lastErrorString!='not an error')
+					? ' [ERROR: ' + db.lastErrorString + ']' : '';
+				throw(e + ' [QUERY: ' + sql + ']' + dberr);
 			}
 		}
 	}
@@ -241,7 +285,9 @@ Scholar.DB = new function(){
 				db.rollbackTransaction();
 			}
 			catch(e){
-				throw(e + ' [ERROR: ' + db.lastErrorString + ']');
+				var dberr = (db.lastErrorString!='not an error')
+					? ' [ERROR: ' + db.lastErrorString + ']' : '';
+				throw(e + ' [QUERY: ' + sql + ']' + dberr);
 			}
 		}
 	}
@@ -312,7 +358,7 @@ Scholar.DB = new function(){
 		// Get the profile directory
 		var file = Components.classes["@mozilla.org/file/directory_service;1"]
 			.getService(Components.interfaces.nsIProperties)
-			.get("ProfD", Components.interfaces.nsILocalFile);
+			.get("ProfD", Components.interfaces.nsIFile);
 		
 		// This makes file point to PROFILE_DIR/<scholar database file>
 		file.append(SCHOLAR_CONFIG['DB_FILE']);