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

Fix queryMethod error

Browse source
This commit is contained in:
Dan Stillman 2013-04-05 01:19:05 -04:00
parent ea12afa045
commit 49da992285
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -247,10 +247,6 @@ Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams)
throw ("Cannot access database layer from a higher wait level if a transaction is open"); throw ("Cannot access database layer from a higher wait level if a transaction is open");
} }
// First, determine the type of query using first word
var matches = sql.match(/^[^\s\(]*/);
var queryMethod = matches[0].toLowerCase();
[sql, params] = this.parseQueryAndParams(sql, params); [sql, params] = this.parseQueryAndParams(sql, params);
try { try {
@ -372,6 +368,10 @@ Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams)
Zotero.DBConnection.prototype.parseQueryAndParams = function (sql, params) { Zotero.DBConnection.prototype.parseQueryAndParams = function (sql, params) {
if (params) { if (params) {
// First, determine the type of query using first word
var matches = sql.match(/^[^\s\(]*/);
var queryMethod = matches[0].toLowerCase();
// If single scalar value or single non-array object, wrap in an array // If single scalar value or single non-array object, wrap in an array
if (typeof params != 'object' || params === null || if (typeof params != 'object' || params === null ||
(typeof params == 'object' && !params.length)) { (typeof params == 'object' && !params.length)) {