Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for strings in where clauses #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added support for strings in where clauses #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
face205
Added support for strings in where clauses
imownbey Aug 1, 2013
91debab
Clean things up a bit
imownbey Aug 1, 2013
e28c070
fixed array and null insertion into string where
hurshagrawal Aug 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 52 additions & 23 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,8 @@ UPDATE.prototype = {
},
WHERE: function(where,conjunction) {
assert(this.text.indexOf('SET') >= 0);
if (conjunction === undefined) {
conjunction = 'AND';
}
assert(conjunction == 'AND' || conjunction == 'OR');
this.text += ' WHERE ' + get_where_clause(where, this.values, conjunction);
return this;
this.text += generate_where_clause(arguments, this.values);
return this
},
RETURNING: function(returning) {
assert(this.text.indexOf('SET') >= 0);
Expand Down Expand Up @@ -79,14 +75,11 @@ SELECT.prototype = {
this.text += ' FROM ' + table;
return this;
},
WHERE: function(where,conjunction) {
// where,conjunction
WHERE: function() {
assert(this.text.indexOf('FROM') >= 0);
if (conjunction === undefined) {
conjunction = 'AND';
}
assert(conjunction == AND || conjunction == OR);
this.text += ' WHERE ' + get_where_clause(where, this.values, conjunction);
return this;
this.text += generate_where_clause(arguments, this.values);
return this
},
ORDER_BY: function(what,direction) {
assert(this.text.indexOf('FROM') >= 0);
Expand Down Expand Up @@ -151,12 +144,8 @@ function DELETE(table) {

DELETE.prototype = {
WHERE: function(where,conjunction) {
if (conjunction === undefined) {
conjunction = 'AND';
}
assert(conjunction == AND || conjunction == OR);
this.text += ' WHERE ' + get_where_clause(where, this.values, conjunction);
return this;
this.text += generate_where_clause(arguments, this.values);
return this
},
LIMIT: function(count) {
assert(this.text.indexOf('WHERE') >= 0);
Expand Down Expand Up @@ -191,10 +180,24 @@ function get_set_clause(set, values) {
}).join(', ');
}

// used in UPDATE, SELECT and DELETE
// can handle where objects like so:
// { foo: [1,2,3,4], bar: NOT_NULL, baz: null }
function get_where_clause(where, values, conjunction){
// (iano): Because the rest of these functions are some weird combination
// of functional and destructive I have allowed myself to be completely
// destructive here. [dealwithit]
function generate_where_clause(args, values) {
var clause;
if (args[0] !== null && typeof args[0] == 'object') {
clause = where_clause_from_object(args[0], args[1], values);
} else if (typeof args[0] == 'string') {
clause = where_clause_from_string(args[0], args[1] || [], values);
}
return ' WHERE ' + clause
};

function where_clause_from_object(where, conjunction, values) {
if (conjunction === undefined) {
conjunction = 'AND';
}
assert(conjunction == AND || conjunction == OR);
return Object.keys(where).map(function column_to_where(c,i) {
var value = where[c];
if (Array.isArray(value)) {
Expand All @@ -211,6 +214,32 @@ function get_where_clause(where, values, conjunction){
return c + ' = $' + values.length;
}
}).join(' ' + conjunction + ' ');
};

function where_clause_from_string(str, new_values, values) {
return str.replace(/\?/g, function () {
var value = new_values.shift();

if (Array.isArray(value)) {
return '(' + value.map(function(v) {
values.push(v);
return '$' + values.length;
}).join(', ') + ')';
} else if (value === null) {
return 'NULL';
} else if (value === NOT_NULL) {
return 'NOT NULL';
} else {
values.push(value);
return '$' + values.length;
}
});
};

// used in UPDATE, SELECT and DELETE
// can handle where objects like so:
// { foo: [1,2,3,4], bar: NOT_NULL, baz: null }
function get_where_clause(where, values, conjunction){
}

module.exports = {
Expand Down
20 changes: 20 additions & 0 deletions test/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,26 @@ describe('SELECT', function(){
sql.values.should.have.length(0);
});
});
describe('#().FROM(table).WHERE("(id < ?) AND (bar = ?)", [3, 5]).ORDER_BY(col,ASC)', function(){
it('should return an object with placeholders and populated values', function(){
var sql = SELECT().FROM('foo').WHERE("(id < ?) AND (bar = ?)", [3, 5])
sql.should.have.text;
sql.should.have.values;
sql.text.should.equal('SELECT * FROM foo WHERE (id < $1) AND (bar = $2)')
sql.values.should.be.an.instanceOf(Array)
sql.values.should.eql([3, 5]);
});
});
describe('#().FROM(table).WHERE("id IN ?", [[3, 5, 6]]).ORDER_BY(col,ASC)', function(){
it('should return an object with placeholders and populated values', function(){
var sql = SELECT().FROM('foo').WHERE("id IN ?", [[3, 5]])
sql.should.have.text;
sql.should.have.values;
sql.text.should.equal('SELECT * FROM foo WHERE id IN ($1, $2)')
sql.values.should.be.an.instanceOf(Array)
sql.values.should.eql([3, 5]);
});
});
describe('#().FROM(table).WHERE(where_null,OR).ORDER_BY(col,ASC).LIMIT(10).OFFSET(10)', function(){
it('should return an object with placeholders and populated values', function(){
var sql = SELECT().FROM('foo').WHERE({ a: NULL, b: NOT_NULL },OR).ORDER_BY('bar','ASC').LIMIT(10).OFFSET(10);
Expand Down