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

Automatically hard-code NULL bound parameters (e.g., convert "WHERE foo=?" to "WHERE foo IS NULL" and "SET foo=?" to "SET foo=NULL")

Browse source
This commit is contained in:
Dan Stillman 2009-05-17 07:52:05 +00:00
parent 2d619ff561
commit 643376769a
1 changed files with 68 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,6 +213,65 @@ Zotero.DBConnection.prototype.columnQuery = function (sql,params) {
Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams) {
var db = this._getDBConnection();
// First, determine the type of query using first word
var matches = sql.match(/^[^\s\(]*/);
queryMethod = matches[0].toLowerCase();
if (params) {
// If single scalar value or single non-array object, wrap in an array
if (typeof params != 'object' || params === null ||
(params && typeof params == 'object' && !params.length)) {
var params = [params];
}
// Since we might make changes, only work on a copy of the array
var params = params.concat();
// Replace NULL bound parameters with hard-coded NULLs
var nullRE = /\s*=?\s*\?/g;
// Reset lastIndex, since regexp isn't recompiled dynamically
nullRE.lastIndex = 0;
var lastNullParamIndex = -1;
for (var i=0; i<params.length; i++) {
if (typeof params[i] != 'object' || params[i] !== null) {
continue;
}
// Find index of this parameter, skipping previous ones
do {
var matches = nullRE.exec(sql);
lastNullParamIndex++;
}
while (lastNullParamIndex < i);
lastNullParamIndex = i;
if (matches[0].indexOf('=') == -1) {
// mozStorage supports null bound parameters in value lists (e.g., "(?,?)") natively
continue;
//var repl = 'NULL';
}
else if (queryMethod == 'select') {
var repl = ' IS NULL';
}
else {
var repl = '=NULL';
}
var subpos = matches.index;
var sublen = matches[0].length;
sql = sql.substring(0, subpos) + repl + sql.substr(subpos + sublen);
//Zotero.debug("Hard-coding null bound parameter " + i);
params.splice(i, 1);
i--;
continue;
}
if (!params.length) {
params = undefined;
}
}
try {
this._debug(sql,5);
var statement = db.createStatement(sql);
@ -226,12 +285,6 @@ Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams)
var numParams = statement.parameterCount;
if (params) {
// If single scalar value or single non-array object, wrap in an array
if (typeof params != 'object' || params === null ||
(params && typeof params == 'object' && !params.length)) {
params = [params];
}
if (checkParams) {
if (numParams == 0) {
throw ("Parameters provided for query without placeholders");
@ -243,6 +296,14 @@ Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams)
}
for (var i=0; i<params.length; i++) {
if (params[i] === undefined) {
Zotero.debug(params);
var msg = 'Parameter ' + i + ' is undefined in Zotero.DB.getStatement() [QUERY: ' + sql + ']';
Zotero.debug(msg);
Components.utils.reportError(msg);
throw (msg);
}
// Integer
if (params[i]!==null && typeof params[i]['int'] != 'undefined') {
var type = 'int';
@ -253,10 +314,6 @@ Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams)
var type = 'string';
var value = params[i]['string'];
}
// Null
else if (params[i]!==null && typeof params[i]['null'] != 'undefined') {
var type = 'null';
}
// Automatic (trust the JS type)
else {
switch (typeof params[i]) {
@ -316,8 +373,7 @@ Zotero.DBConnection.prototype.getStatement = function (sql, params, checkParams)
break;
case 'null':
this._debug('Binding parameter ' + (i+1)
+ ' of type NULL', 5);
this._debug('Binding parameter ' + (i+1) + ' of type NULL', 5);
statement.bindNullParameter(i);
break;
}