fix instance.set '1970-01-01' to null field (#6853)

lib/model.js

@@ -3101,15 +3101,17 @@ class Model {
                 if (!(value instanceof Date)) {
                   value = new Date(value);
                 }
+                if (originalValue) {
                   if (!(originalValue instanceof Date)) {
                     originalValue = new Date(originalValue);
                   }
-                if (originalValue && value.getTime() === originalValue.getTime()) {
+                  if (value.getTime() === originalValue.getTime()) {
                     return this;
                   }
                 }
               }
             }
+          }
 
           // Convert boolean-ish values to booleans
           if (this.constructor._hasBooleanAttributes && this.constructor._isBooleanAttribute(key) && value !== null && value !== undefined && !value._isSequelizeMethod) {

test/unit/instance/set.test.js

 'use strict';
 
 /* jshint -W030 */
-var chai = require('chai')
+const chai = require('chai')
   , expect = chai.expect
   , Support   = require(__dirname + '/../support')
   , DataTypes = require(__dirname + '/../../../lib/data-types')
@@ -10,10 +10,10 @@ var chai = require('chai')
 describe(Support.getTestDialectTeaser('Instance'), function() {
   describe('set', function () {
     it('sets nested keys in JSON objects', function () {
-      var User = current.define('User', {
+      const User = current.define('User', {
         meta: DataTypes.JSONB
       });
-      var user = User.build({
+      const user = User.build({
         meta: {
           location: 'Stockhollm'
         }
@@ -22,7 +22,7 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
         raw: true
       });
 
-      var meta = user.get('meta');
+      const meta = user.get('meta');
 
       user.set('meta.location', 'Copenhagen');
       expect(user.dataValues['meta.location']).not.to.be.ok;
@@ -32,17 +32,48 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
     });
 
     it('doesnt mutate the JSONB defaultValue', function() {
-      var User = current.define('User', {
+      const User = current.define('User', {
         meta: {
           type: DataTypes.JSONB,
           allowNull: false,
           defaultValue: {}
         }
       });
-      var user1 = User.build({});
+      const user1 = User.build({});
       user1.set('meta.location', 'Stockhollm');
-      var user2 = User.build({});
+      const user2 = User.build({});
       expect(user2.get('meta')).to.deep.equal({});
     });
+
+    it('sets the date "1970-01-01" to previously null field', function() {
+      const User = current.define('User', {
+        date: {
+          type: DataTypes.DATE,
+          allowNull: true
+        }
+      });
+      const user1 = User.build({
+        date: null
+      });
+      user1.set('date', '1970-01-01');
+      expect(user1.get('date')).to.be.ok;
+      expect(user1.get('date').getTime()).to.equal(new Date('1970-01-01').getTime());
+    });
+
+    it('overwrites non-date originalValue with date', function() {
+      const User = current.define('User', {
+        date: DataTypes.DATE
+      });
+      const user = User.build({
+        date: ' '
+      }, {
+        isNewRecord: false,
+        raw: true
+      });
+
+      user.set('date', new Date());
+      expect(user.get('date')).to.be.an.instanceof(Date);
+      expect(user.get('date')).not.to.be.NaN;
+    });
   });
 });