Merge pull request brianc#66 from doxout/where-object-multicolumn-fix

brianc · brianc · commit 60d6262ea109 · 2013-05-13T11:30:40.000-07:00
fix multi-field object in where clause bug
diff --git a/lib/node/where.js b/lib/node/where.js
@@ -17,7 +17,7 @@ var normalizeNode = function(table, node) {
       if (!result)
         result = query;
       else
-        result.and(query);
+        result = result.and(query);
     }
   }
   return result;
diff --git a/test/dialects/table-tests.js b/test/dialects/table-tests.js
@@ -166,6 +166,14 @@ Harness.test({
   params: ['brian']
 });
 
+Harness.test({
+  query : user.select('name').from('user').where({name: 'brian', id: 1}),
+  pg    : 'SELECT name FROM user WHERE (("user"."name" = $1) AND ("user"."id" = $2))',
+  sqlite: 'SELECT name FROM user WHERE (("user"."name" = $1) AND ("user"."id" = $2))',
+  mysql : 'SELECT name FROM user WHERE ((`user`.`name` = ?) AND (`user`.`id` = ?))',
+  params: ['brian', 1]
+});
+
 Harness.test({
   query : user.select(user.name.as('quote"quote"tick`tick`')),
   pg    : 'SELECT "user"."name" AS "quote""quote""tick`tick`" FROM "user"',

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ var normalizeNode = function(table, node) {`
`17`	`17`	`if (!result)`
`18`	`18`	`result = query;`
`19`	`19`	`else`
`20`		`- result.and(query);`
	`20`	`+ result = result.and(query);`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`return result;`