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

Use more concise 1-line format for SQL logging

Browse source 
SELECT * FROM foo WHERE bar=? AND qux=? ['foo', 1]

Not sure why I didn't do this years ago...
This commit is contained in:
Dan Stillman 2015-05-21 23:09:07 -04:00
parent ada657fcb8
commit f4446e268d
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
chrome/content/zotero/xpcom/db.js
View file

@ -606,14 +606,8 @@ Zotero.DBConnection.prototype.queryAsync = function (sql, params, options) {
.then(function (c) {
conn = c;
[sql, params] = self.parseQueryAndParams(sql, params);
if (Zotero.Debug.enabled && (!options || options.debug === undefined || options.debug === true)) {
Zotero.debug(sql, 5);
for each(let param in params) {
let paramType = typeof param;
let msg = "Binding parameter of type " + paramType + ": ";
msg += paramType == 'string' ? "'" + param + "'" : param;
Zotero.debug(msg, 5);
}
if (Zotero.Debug.enabled) {
self.logQuery(sql, params, options);
}
if (options && options.onRow) {
// Errors in onRow don't stop the query unless StopIteration is thrown
@ -715,13 +709,7 @@ Zotero.DBConnection.prototype.valueQueryAsync = function (sql, params) {
.then(function (conn) {
[sql, params] = self.parseQueryAndParams(sql, params);
if (Zotero.Debug.enabled) {
Zotero.debug(sql, 5);
for each(let param in params) {
let paramType = typeof param;
let msg = "Binding parameter of type " + paramType + ": ";
msg += paramType == 'string' ? "'" + param + "'" : param;
Zotero.debug(msg, 5);
}
self.logQuery(sql, params);
}
return conn.executeCached(sql, params);
})
@ -767,13 +755,7 @@ Zotero.DBConnection.prototype.columnQueryAsync = function (sql, params) {
conn = c;
[sql, params] = self.parseQueryAndParams(sql, params);
if (Zotero.Debug.enabled) {
Zotero.debug(sql, 5);
for each(let param in params) {
let paramType = typeof param;
let msg = "Binding parameter of type " + paramType + ": ";
msg += paramType == 'string' ? "'" + param + "'" : param;
Zotero.debug(msg, 5);
}
self.logQuery(sql, params);
}
return conn.executeCached(sql, params);
})
@ -797,6 +779,26 @@ Zotero.DBConnection.prototype.columnQueryAsync = function (sql, params) {
};
Zotero.DBConnection.prototype.logQuery = function (sql, params, options) {
var msg = sql;
if (params.length && (!options || options.debug === undefined || options.debug === true)) {
msg += " [";
for (let i = 0; i < params.length; i++) {
let param = params[i];
let paramType = typeof param;
if (paramType == 'string') {
msg += "'" + param + "', ";
}
else {
msg += param + ", ";
}
}
msg = msg.substr(0, msg.length - 2) + "]";
}
Zotero.debug(msg, 5);
}
Zotero.DBConnection.prototype.tableExists = function (table) {
return this._getConnectionAsync()
.then(function () {