From 93c15fc061e8a4ded9da0d9aa3820b395bf48aaa Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 20 Sep 2006 23:20:11 +0000
Subject: [PATCH] Allow for single objects as bound parameters without wrapping
 in array (e.g. DB.query(sql, {string:isbn}))

---
 chrome/chromeFiles/content/scholar/xpcom/db.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/chrome/chromeFiles/content/scholar/xpcom/db.js b/chrome/chromeFiles/content/scholar/xpcom/db.js
index e6e413e1b..2b9054e94 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/db.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/db.js
@@ -171,8 +171,10 @@ Scholar.DB = new function(){
 		}
 		
 		if (statement && params){
-			// If single parameter, wrap in an array
-			if (typeof params != 'object' || params===null){
+			// If single scalar value or single object, wrap in an array
+			if ((typeof params != 'object' || params===null) ||
+				(params && typeof params == 'object' &&
+				 params.constructor != Array)){
 				params = [params];
 			}
 			
@@ -231,6 +233,7 @@ Scholar.DB = new function(){
 						Scholar.debug('Binding parameter ' + (i+1)
 							+ ' of type NULL', 5);
 						statement.bindNullParameter(i);
+						break;
 				}
 			}
 		}