Merge pull request #5367 from rafis/master

Set updatedAt and createdAt values before validation

lib/instance.js

@@ -525,9 +525,10 @@ Instance.prototype.save = function(options) {
     , updatedAtAttr = this.Model._timestampAttributes.updatedAt
     , updatedAtAttr = this.Model._timestampAttributes.updatedAt
     , createdAtAttr = this.Model._timestampAttributes.createdAt
     , createdAtAttr = this.Model._timestampAttributes.createdAt
     , hook = self.isNewRecord ? 'Create' : 'Update'
     , hook = self.isNewRecord ? 'Create' : 'Update'
-    , wasNewRecord = this.isNewRecord;
+    , wasNewRecord = this.isNewRecord
+    , now = Utils.now(this.sequelize.options.dialect);
 
 
-  if (updatedAtAttr && options.fields.indexOf(updatedAtAttr) === -1) {
+  if (updatedAtAttr && options.fields.length >= 1 && options.fields.indexOf(updatedAtAttr) === -1) {
     options.fields.push(updatedAtAttr);
     options.fields.push(updatedAtAttr);
   }
   }
 
 
@@ -555,6 +556,14 @@ Instance.prototype.save = function(options) {
     }
     }
   }
   }
 
 
+  if (updatedAtAttr && !options.silent && options.fields.indexOf(updatedAtAttr) !== -1) {
+    this.dataValues[updatedAtAttr] = this.Model.$getDefaultTimestamp(updatedAtAttr) || now;
+  }
+
+  if (this.isNewRecord && createdAtAttr && !this.dataValues[createdAtAttr]) {
+    this.dataValues[createdAtAttr] = this.Model.$getDefaultTimestamp(createdAtAttr) || now;
+  }
+
   return Promise.bind(this).then(function() {
   return Promise.bind(this).then(function() {
     // Validate
     // Validate
     if (options.validate) {
     if (options.validate) {
@@ -639,16 +648,7 @@ Instance.prototype.save = function(options) {
 
 
       var values = Utils.mapValueFieldNames(this.dataValues, options.fields, this.Model)
       var values = Utils.mapValueFieldNames(this.dataValues, options.fields, this.Model)
         , query = null
         , query = null
-        , args = []
-        , now = Utils.now(this.sequelize.options.dialect);
-
-      if (updatedAtAttr && !options.silent) {
-        self.dataValues[updatedAtAttr] = values[self.Model.rawAttributes[updatedAtAttr].field || updatedAtAttr] = self.Model.$getDefaultTimestamp(updatedAtAttr) || now;
-      }
-
-      if (self.isNewRecord && createdAtAttr && !values[createdAtAttr]) {
-        self.dataValues[createdAtAttr] = values[self.Model.rawAttributes[createdAtAttr].field || createdAtAttr] = self.Model.$getDefaultTimestamp(createdAtAttr) || now;
-      }
+        , args = [];
 
 
       if (self.isNewRecord) {
       if (self.isNewRecord) {
         query = 'insert';
         query = 'insert';

test/integration/instance.test.js

@@ -1172,6 +1172,9 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
             self.clock.tick(2000);
             self.clock.tick(2000);
             return user.save().then(function(newlySavedUser) {
             return user.save().then(function(newlySavedUser) {
               expect(newlySavedUser.updatedAt).to.equalTime(updatedAt);
               expect(newlySavedUser.updatedAt).to.equalTime(updatedAt);
+              return self.User.findOne({ username: 'John' }).then(function(newlySavedUser) {
+                expect(newlySavedUser.updatedAt).to.equalTime(updatedAt);
+              });
             });
             });
           });
           });
         });
         });
@@ -1242,6 +1245,28 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
           });
           });
         });
         });
       });
       });
+
+      it('works with `allowNull: false` on createdAt and updatedAt columns', function() {
+        var User2 = this.sequelize.define('User2', {
+          username: DataTypes.STRING,
+          createdAt: {
+            type: DataTypes.DATE,
+            allowNull: false
+          },
+          updatedAt: {
+            type: DataTypes.DATE,
+            allowNull: false
+          }
+        }, { timestamps: true });
+
+        return User2.sync().then(function() {
+          return User2.create({ username: 'john doe' }).then(function(johnDoe) {
+            expect(johnDoe.createdAt).to.be.an.instanceof(Date);
+            expect( ! isNaN(johnDoe.createdAt.valueOf()) ).to.be.ok;
+            expect(johnDoe.createdAt).to.equalTime(johnDoe.updatedAt);
+          });
+        });
+      });
     });
     });
 
 
     it('should fail a validation upon creating', function() {
     it('should fail a validation upon creating', function() {