Merge pull request #826 from durango/where-false

You should now be able to declare false/true booleans within the where s...

lib/utils.js

@@ -29,6 +29,19 @@ var Utils = module.exports = {
         }
         }
 
 
         return result
         return result
+      },
+      compactLite: function(array) {
+        var index = -1,
+          length = array ? array.length : 0,
+          result = [];
+
+        while (++index < length) {
+          var value = array[index];
+          if (typeof value === "boolean" || value) {
+            result.push(value);
+          }
+        }
+        return result;
       }
       }
     })
     })
 
 
@@ -201,7 +214,7 @@ var Utils = module.exports = {
       }
       }
     }
     }
 
 
-    return lodash.compact([text.join(' AND ')].concat(whereArgs))
+    return Utils._.compactLite([text.join(' AND ')].concat(whereArgs))
   },
   },
   getWhereLogic: function(logic) {
   getWhereLogic: function(logic) {
     switch (logic) {
     switch (logic) {

test/associations/has-one.test.js

@@ -19,7 +19,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
             Task.create({ title: 'task', status: 'inactive' }).success(function(task) {
             Task.create({ title: 'task', status: 'inactive' }).success(function(task) {
               user.setTaskXYZ(task).success(function() {
               user.setTaskXYZ(task).success(function() {
                 user.getTaskXYZ({where: ['status = ?', 'active']}).success(function(task) {
                 user.getTaskXYZ({where: ['status = ?', 'active']}).success(function(task) {
-                  expect(task).to.equal(null)
+                  expect(task).to.be.null
                   done()
                   done()
                 })
                 })
               })
               })

test/dao-factory.test.js

@@ -21,7 +21,8 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       secretValue:  DataTypes.STRING,
       secretValue:  DataTypes.STRING,
       data:         DataTypes.STRING,
       data:         DataTypes.STRING,
       intVal:       DataTypes.INTEGER,
       intVal:       DataTypes.INTEGER,
-      theDate:      DataTypes.DATE
+      theDate:      DataTypes.DATE,
+      aBool:        DataTypes.BOOLEAN
     })
     })
     this.User.sync({ force: true }).success(function() {
     this.User.sync({ force: true }).success(function() {
       done()
       done()
@@ -999,6 +1000,70 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         })
         })
     })
     })
 
 
+    it('should be able to handle false/true values just fine...', function(done) {
+      var User = this.User
+      User.bulkCreate([
+        {username: 'boo5', aBool: false},
+        {username: 'boo6', aBool: true}
+      ]).success(function() {
+        User.all({where: ['"aBool" = ?', false]}).success(function(users) {
+          expect(users).to.have.length(1)
+          expect(users[0].username).to.equal('boo5')
+          User.all({where: ['"aBool" = ?', true]}).success(function(_users) {
+            expect(_users).to.have.length(1)
+            expect(_users[0].username).to.equal('boo6')
+            done()
+          })
+        })
+      })
+    })
+
+    it('should be able to handle false/true values through associations as well...', function(done) {
+      var User = this.User
+      var Passports = this.sequelize.define('Passports', {
+        isActive: Sequelize.BOOLEAN
+      })
+
+      User.hasMany(Passports)
+      Passports.belongsTo(User)
+
+      User.sync({ force: true }).success(function() {
+        Passports.sync({ force: true }).success(function() {
+          User.bulkCreate([
+            {username: 'boo5', aBool: false},
+            {username: 'boo6', aBool: true}
+          ]).success(function() {
+            Passports.bulkCreate([
+              {isActive: true},
+              {isActive: false}
+            ]).success(function() {
+              User.find(1).success(function(user) {
+                Passports.find(1).success(function(passport) {
+                  user.setPassports([passport]).success(function() {
+                    User.find(2).success(function(_user) {
+                      Passports.find(2).success(function(_passport) {
+                        _user.setPassports([_passport]).success(function() {
+                          _user.getPassports({where: ['"isActive" = ?', false]}).success(function(theFalsePassport) {
+                            user.getPassports({where: ['"isActive" = ?', true]}).success(function(theTruePassport) {
+                              expect(theFalsePassport).to.have.length(1)
+                              expect(theFalsePassport[0].isActive).to.be.false
+                              expect(theTruePassport).to.have.length(1)
+                              expect(theTruePassport[0].isActive).to.be.true
+                              done()
+                            })
+                          })
+                        })
+                      })
+                    })
+                  })
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
     it('should be able to retun a record with primaryKey being null for new inserts', function(done) {
     it('should be able to retun a record with primaryKey being null for new inserts', function(done) {
       var Session = this.sequelize.define('Session', {
       var Session = this.sequelize.define('Session', {
           token: { type: DataTypes.TEXT, allowNull: false },
           token: { type: DataTypes.TEXT, allowNull: false },