allow two #where calls. closes brianc#14

brianc · brianc · commit d535c6747b0e · 2012-12-21T18:37:03.000Z
diff --git a/lib/node/query.js b/lib/node/query.js
@@ -36,16 +36,18 @@ var Query = Node.define({
     return this.add(from);
   },
   where: function(node) {
-    this.where = new Where();
-    this.where.add(node);
-    return this.add(this.where);
+    //calling #where twice functions like calling #where & then #and
+    if(this.whereClause) return this.and(node);
+    this.whereClause = new Where();
+    this.whereClause.add(node);
+    return this.add(this.whereClause);
   },
   or: function(node) {
-    this.where.or(node);
+    this.whereClause.or(node);
     return this;
   },
   and: function(node) {
-    this.where.and(node);
+    this.whereClause.and(node);
     return this;
   },
   order: function() {
diff --git a/test/dialect-tests.js b/test/dialect-tests.js
@@ -311,3 +311,11 @@ test({
   query : user.where(user.name.equals(3)),
   pg    : 'SELECT "user".* FROM "user" WHERE ("user"."name" = $1)'
 });
+
+var q = user.where(user.name.equals(3))
+  console.log(q)
+  console.log(Object.keys(q))
+test({
+  query : user.where(user.name.equals(3)).where(user.id.equals(1)),
+  pg    : 'SELECT "user".* FROM "user" WHERE (("user"."name" = $1) AND ("user"."id" = $2))'
+});
