Merge pull request #601 from durango/validate-save-null

Validations will now be called upon .save() and allowNull: true skips validations

README.md

@@ -54,7 +54,8 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - ~~Support for update and delete calls for whole tables without previous loading of instances~~ Implemented in [#569](https://github.com/sequelize/sequelize/pull/569) thanks to @optiltude
 - Eager loading of nested associations [#388](https://github.com/sdepold/sequelize/issues/388#issuecomment-12019099)
 - Model#delete
-- Validate a model before it gets saved. (Move validation of enum attribute value to validate method)
+- ~~Validate a model before it gets saved.~~ Implemented in [#601](https://github.com/sequelize/sequelize/pull/601), thanks to @durango
+- Move validation of enum attribute value to validate method
 - BLOB [#99](https://github.com/sequelize/sequelize/issues/99)
 - ~~Support for foreign keys~~ Implemented in [#595](https://github.com/sequelize/sequelize/pull/595), thanks to @optilude
 

changelog.md

 # v1.7.0 #
+- [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601), thanks to durango
 - [DEPENDENCIES] replaced underscore by lodash. [#954](https://github.com/sequelize/sequelize/pull/594). thanks to durango
 - [BUG] Fix string escape with postgresql on raw SQL queries. [#586](https://github.com/sequelize/sequelize/pull/586). thanks to zanamixx
 - [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics

lib/dao.js

@@ -150,7 +150,14 @@ module.exports = (function() {
       this[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
     }
 
-    if (this.isNewRecord) {
+    var errors = this.validate()
+
+    if (!!errors) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        emitter.emit('error', errors)
+      }).run()
+    }
+    else if (this.isNewRecord) {
       return this.QueryInterface.insert(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory), values)
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id;
@@ -211,7 +218,9 @@ module.exports = (function() {
     Utils._.each(self.values, function(value, field) {
 
       // if field has validators
-      if (self.validators.hasOwnProperty(field)) {
+      var hasAllowedNull = (self.rawAttributes[field].allowNull && self.rawAttributes[field].allowNull === true && (value === null || value === undefined));
+
+      if (self.validators.hasOwnProperty(field) && !hasAllowedNull) {
         // for each validator
         Utils._.each(self.validators[field], function(details, validatorType) {
 

spec/dao.spec.js

@@ -20,6 +20,18 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
           touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
           aNumber:   { type: DataTypes.INTEGER },
           bNumber:   { type: DataTypes.INTEGER },
+
+          validateTest: {
+            type: DataTypes.INTEGER,
+            allowNull: true,
+            validate: {isInt: true}
+          },
+          validateCustom: {
+            type: DataTypes.STRING,
+            allowNull: true,
+            validate: {len: {msg: 'Length failed.', args: [1,20]}}
+          },
+
           dateAllowNullTrue: {
             type: DataTypes.DATE,
             allowNull: true
@@ -378,6 +390,44 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
   })
 
   describe('save', function() {
+    it('should fail a validation upon creating', function(done){
+      this.User.create({aNumber: 0, validateTest: 'hello'}).error(function(err){
+        expect(err).toBeDefined()
+        expect(err).toBeObject()
+        expect(err.validateTest).toBeArray()
+        expect(err.validateTest[0]).toBeDefined()
+        expect(err.validateTest[0].indexOf('Invalid integer')).toBeGreaterThan(-1);
+        done();
+      });
+    })
+
+    it('should fail a validation upon building', function(done){
+      this.User.build({aNumber: 0, validateCustom: 'aaaaaaaaaaaaaaaaaaaaaaaaaa'}).save()
+      .error(function(err){
+        expect(err).toBeDefined()
+        expect(err).toBeObject()
+        expect(err.validateCustom).toBeDefined()
+        expect(err.validateCustom).toBeArray()
+        expect(err.validateCustom[0]).toBeDefined()
+        expect(err.validateCustom[0]).toEqual('Length failed.')
+        done()
+      })
+    })
+
+    it('should fail a validation when updating', function(done){
+      this.User.create({aNumber: 0}).success(function(user){
+        user.updateAttributes({validateTest: 'hello'}).error(function(err){
+          expect(err).toBeDefined()
+          expect(err).toBeObject()
+          expect(err.validateTest).toBeDefined()
+          expect(err.validateTest).toBeArray()
+          expect(err.validateTest[0]).toBeDefined()
+          expect(err.validateTest[0].indexOf('Invalid integer:')).toBeGreaterThan(-1)
+          done()
+        })
+      })
+    })
+
     it('takes zero into account', function(done) {
       this.User.build({ aNumber: 0 }).save([ 'aNumber' ]).success(function(user) {
         expect(user.aNumber).toEqual(0)