Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/karb/TitaniORM into karb-…
Browse files Browse the repository at this point in the history
…master
  • Loading branch information
James Hall committed Apr 7, 2011
2 parents 29ea568 + 991ad7b commit 527415c
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions titaniorm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

var db = function(database, table) {

// Private
Expand Down Expand Up @@ -82,7 +81,7 @@ var db = function(database, table) {
var sql = 'SELECT ' + field_sql + ' FROM ' + table + ' WHERE 1=1';
// @TODO: Use prepared queries on conditions to prevent injection
for(var condition in conditions) {
sql += ' AND ' + condition + ' = ' + conditions[condition];
sql += ' AND ' + condition + ' = "' + conditions[condition] +'"';
}
sql += ' ORDER BY ' + order;
var rows = executeSql(sql);
Expand Down

0 comments on commit 527415c

Please sign in to comment.