Merge pull request #404 from watson/where-bug

Fix bug in Utils.format that ignore falsy values

lib/utils.js

@@ -47,10 +47,7 @@ var Utils = module.exports = {
     return connection.escape(s).replace(/\\"/g, '"')
     return connection.escape(s).replace(/\\"/g, '"')
   },
   },
   format: function(arr) {
   format: function(arr) {
-    var query        = arr[0]
-      , replacements = Utils._.compact(arr.map(function(obj) { return obj != query ? obj : null}))
-
-    return connection.format.apply(connection, [query, replacements])
+    return connection.format.apply(connection, [arr.shift(), arr])
   },
   },
   isHash: function(obj) {
   isHash: function(obj) {
     return Utils._.isObject(obj) && !Utils._.isArray(obj);
     return Utils._.isObject(obj) && !Utils._.isArray(obj);

spec-jasmine/utils.spec.js

@@ -112,4 +112,16 @@ describe('Utils', function() {
     	expect(Utils.isHash(values)).toBeTruthy();
     	expect(Utils.isHash(values)).toBeTruthy();
     });
     });
   });
   });
+
+  describe('format', function() {
+    it('should format where clause correctly when the value is truthy', function() {
+      var where = ['foo = ?', 1];
+      expect(Utils.format(where)).toEqual('foo = 1');
+    });
+
+    it('should format where clause correctly when the value is falsy', function() {
+      var where = ['foo = ?', 0];
+      expect(Utils.format(where)).toEqual('foo = 0');
+    });
+  });
 })
 })