www

commit dca29a06e39061801ceaaba87f1dac615477ced6
parent 1f643c1baae4dbca49277b23c49b4929006b2d37
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue,  2 Jun 2015 03:29:51 -0400

Include params in DB error messages

Diffstat:
M
chrome/content/zotero/xpcom/db.js
 | 
12
+++++++++---

1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
@@ -686,7 +686,9 @@ Zotero.DBConnection.prototype.queryAsync = function (sql, params, options) {
 		if (e.errors && e.errors[0]) {
 			var eStr = e + "";
 			eStr = eStr.indexOf("Error: ") == 0 ? eStr.substr(7): e;
-			throw new Error(eStr + ' [QUERY: ' + sql + '] [ERROR: ' + e.errors[0].message + ']');
+			throw new Error(eStr + ' [QUERY: ' + sql + '] '
+				+ (params ? '[PARAMS: ' + params.join(', ') + '] ' : '')
+				+ '[ERROR: ' + e.errors[0].message + ']');
 		}
 		else {
 			throw e;
@@ -726,7 +728,9 @@ Zotero.DBConnection.prototype.valueQueryAsync = function (sql, params) {
 		if (e.errors && e.errors[0]) {
 			var eStr = e + "";
 			eStr = eStr.indexOf("Error: ") == 0 ? eStr.substr(7): e;
-			throw new Error(eStr + ' [QUERY: ' + sql + '] [ERROR: ' + e.errors[0].message + ']');
+			throw new Error(eStr + ' [QUERY: ' + sql + '] '
+				+ (params ? '[PARAMS: ' + params.join(', ') + '] ' : '')
+				+ '[ERROR: ' + e.errors[0].message + ']');
 		}
 		else {
 			throw e;
@@ -776,7 +780,9 @@ Zotero.DBConnection.prototype.columnQueryAsync = function (sql, params) {
 		if (e.errors && e.errors[0]) {
 			var eStr = e + "";
 			eStr = eStr.indexOf("Error: ") == 0 ? eStr.substr(7): e;
-			throw new Error(eStr + ' [QUERY: ' + sql + '] [ERROR: ' + e.errors[0].message + ']');
+			throw new Error(eStr + ' [QUERY: ' + sql + '] '
+				+ (params ? '[PARAMS: ' + params.join(', ') + '] ' : '')
+				+ '[ERROR: ' + e.errors[0].message + ']');
 		}
 		else {
 			throw e;