Merge pull request #3072 from Stjaertfena/bug/instance-boolean-converter

Boolean conversion is now only done on valid boolean values/types. Added...

lib/instance.js

@@ -348,7 +348,15 @@ module.exports = (function() {
               // Bit fields are returned as buffers
               // Bit fields are returned as buffers
               value = value[0];
               value = value[0];
             }
             }
-            value = _.isString(value) ? !!parseInt(value, 10) : !!value;
+
+            if (_.isString(value)) {
+              // Only take action on valid boolean strings.
+              value = (value === "true") ? true : (value === "false") ? false : value;
+
+            } else if (_.isNumber(value)) {
+              // Only take action on valid boolean integers.
+              value = (value === 1) ? true : (value === 0) ? false : value;
+            }
           }
           }
 
 
           if (!options.raw && originalValue !== value) {
           if (!options.raw && originalValue !== value) {

test/integration/instance.test.js

@@ -13,6 +13,7 @@ var chai = require('chai')
   , _ = require('lodash')
   , _ = require('lodash')
   , current = Support.sequelize;
   , current = Support.sequelize;
 
 
+chai.should();
 chai.use(datetime);
 chai.use(datetime);
 chai.config.includeStack = true;
 chai.config.includeStack = true;
 
 
@@ -41,6 +42,11 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
       dateAllowNullTrue: {
       dateAllowNullTrue: {
         type: DataTypes.DATE,
         type: DataTypes.DATE,
         allowNull: true
         allowNull: true
+      },
+
+      isSuperUser: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: false
       }
       }
     });
     });
     this.User.sync({ force: true }).success(function() {
     this.User.sync({ force: true }).success(function() {
@@ -738,6 +744,101 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
         });
         });
       });
       });
     });
     });
+
+    describe('super user boolean', function() {
+      it('should default to false', function() {
+        return this.User.build({
+            username: 'a user'
+          })
+          .save()
+          .bind(this)
+          .then(function() {
+            return this.User.find({
+              where: {
+                username: 'a user'
+              }
+            })
+          .then(function(user) {
+            expect(user.isSuperUser).to.be.false;
+          });
+        });
+      });
+
+      it('should override default when given truthy boolean', function() {
+        return this.User.build({
+            username: 'a user',
+            isSuperUser: true
+          })
+          .save()
+          .bind(this)
+          .then(function() {
+            return this.User.find({
+              where: {
+                username: 'a user'
+              }
+            })
+          .then(function(user) {
+            expect(user.isSuperUser).to.be.true;
+          });
+        });
+      });
+
+      it('should override default when given truthy boolean-string ("true")', function() {
+        return this.User.build({
+            username: 'a user',
+            isSuperUser: "true"
+          })
+          .save()
+          .bind(this)
+          .then(function() {
+            return this.User.find({
+              where: {
+                username: 'a user'
+              }
+            })
+          .then(function(user) {
+            expect(user.isSuperUser).to.be.true;
+          });
+        });
+      });
+
+      it('should override default when given truthy boolean-int (1)', function() {
+        return this.User.build({
+          username: 'a user',
+          isSuperUser: 1
+        })
+        .save()
+        .bind(this)
+        .then(function() {
+          return this.User.find({
+            where: {
+              username: 'a user'
+            }
+          })
+        .then(function(user) {
+          expect(user.isSuperUser).to.be.true;
+        });
+        });
+      });
+
+      it('should throw error when given value of incorrect type', function() {
+        var callCount = 0;
+
+        return this.User.build({
+          username: 'a user',
+          isSuperUser: "INCORRECT_VALUE_TYPE"
+        })
+        .save()
+        .then(function () {
+          callCount += 1;
+        })
+        .catch(function(err) {
+          expect(callCount).to.equal(0);
+          expect(err).to.exist;
+          expect(err.message).to.exist;
+        });
+      });
+    });
   });
   });
 
 
   describe('complete', function() {
   describe('complete', function() {