fix(paranoid): use Utils.now to query for paranoid records (#8485)

lib/model.js

@@ -77,9 +77,16 @@ class Model {
     const deletedAtCol = model._timestampAttributes.deletedAt;
     const deletedAtCol = model._timestampAttributes.deletedAt;
     const deletedAtAttribute = model.rawAttributes[deletedAtCol];
     const deletedAtAttribute = model.rawAttributes[deletedAtCol];
     const deletedAtObject = {};
     const deletedAtObject = {};
+    const now = Utils.now(this.sequelize.options.dialect);
+
     let deletedAtDefaultValue = deletedAtAttribute.hasOwnProperty('defaultValue') ? deletedAtAttribute.defaultValue : null;
     let deletedAtDefaultValue = deletedAtAttribute.hasOwnProperty('defaultValue') ? deletedAtAttribute.defaultValue : null;
 
 
-    deletedAtDefaultValue = deletedAtDefaultValue || { [Op.or]: { [Op.gt]: model.sequelize.literal('CURRENT_TIMESTAMP'), [Op.eq]: null } };
+    deletedAtDefaultValue = deletedAtDefaultValue || {
+      [Op.or]: {
+        [Op.gt]: now,
+        [Op.eq]: null
+      }
+    };
 
 
     deletedAtObject[deletedAtAttribute.field || deletedAtCol] = deletedAtDefaultValue;
     deletedAtObject[deletedAtAttribute.field || deletedAtCol] = deletedAtDefaultValue;
 
 

lib/utils.js

@@ -391,7 +391,7 @@ exports.sliceArgs = sliceArgs;
 
 
 function now(dialect) {
 function now(dialect) {
   const now = new Date();
   const now = new Date();
-  if (['mysql', 'postgres', 'sqlite'].indexOf(dialect) === -1) {
+  if (['mysql', 'postgres', 'sqlite', 'mssql'].indexOf(dialect) === -1) {
     now.setMilliseconds(0);
     now.setMilliseconds(0);
   }
   }
   return now;
   return now;

test/integration/instance.test.js

@@ -16,6 +16,10 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
     this.clock = sinon.useFakeTimers();
     this.clock = sinon.useFakeTimers();
   });
   });
 
 
+  afterEach(function() {
+    this.clock.reset();
+  });
+
   after(function() {
   after(function() {
     this.clock.restore();
     this.clock.restore();
   });
   });
@@ -51,6 +55,7 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
         defaultValue: false
         defaultValue: false
       }
       }
     });
     });
+
     return this.User.sync({ force: true });
     return this.User.sync({ force: true });
   });
   });
 
 
@@ -249,18 +254,21 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
       const User = this.sequelize.define('IncrementUser', {
       const User = this.sequelize.define('IncrementUser', {
         aNumber: DataTypes.INTEGER
         aNumber: DataTypes.INTEGER
       }, { timestamps: true });
       }, { timestamps: true });
+
       let oldDate;
       let oldDate;
 
 
-      return User.sync({ force: true }).bind(this).then(() => {
-        return User.create({aNumber: 1});
-      }).then(function(user) {
-        oldDate = user.updatedAt;
+      return User.sync({ force: true })
+        .then(() => User.create({ aNumber: 1 }))
+        .then(user => {
+          oldDate = user.get('updatedAt');
 
 
-        this.clock.tick(1000);
-        return user.increment('aNumber', {by: 1});
-      }).then(() => {
-        return expect(User.findById(1)).to.eventually.have.property('updatedAt').afterTime(oldDate);
-      });
+          this.clock.tick(1000);
+          return user.increment('aNumber', { by: 1 });
+        })
+        .then(user => user.reload())
+        .then(user => {
+          return expect(user).to.have.property('updatedAt').afterTime(oldDate);
+        });
     });
     });
 
 
     it('with timestamps set to true and options.silent set to true', function() {
     it('with timestamps set to true and options.silent set to true', function() {
@@ -1162,11 +1170,20 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
     });
     });
 
 
     it('updates the timestamps', function() {
     it('updates the timestamps', function() {
-      const now = new Date(),
-        user = this.User.build({ username: 'user' });
+      const now = new Date();
+      now.setMilliseconds(0);
 
 
+      const user = this.User.build({ username: 'user' });
       this.clock.tick(1000);
       this.clock.tick(1000);
-      return expect(user.save()).to.eventually.have.property('updatedAt').afterTime(now);
+
+      return user.save().then(savedUser => {
+        expect(savedUser).have.property('updatedAt').afterTime(now);
+
+        this.clock.tick(1000);
+        return savedUser.save();
+      }).then(updatedUser => {
+        expect(updatedUser).have.property('updatedAt').afterTime(now);
+      });
     });
     });
 
 
     it('does not update timestamps when passing silent=true', function() {
     it('does not update timestamps when passing silent=true', function() {
@@ -1212,15 +1229,6 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
     });
     });
 
 
     describe('when nothing changed', () => {
     describe('when nothing changed', () => {
-
-      beforeEach(function() {
-        this.clock = sinon.useFakeTimers();
-      });
-
-      afterEach(function() {
-        this.clock.restore();
-      });
-
       it('does not update timestamps', function() {
       it('does not update timestamps', function() {
         const self = this;
         const self = this;
         return self.User.create({ username: 'John' }).then(() => {
         return self.User.create({ username: 'John' }).then(() => {

test/integration/instance/update.test.js

@@ -5,7 +5,6 @@ const chai = require('chai'),
   Sequelize = require('../../../index'),
   Sequelize = require('../../../index'),
   expect = chai.expect,
   expect = chai.expect,
   Support = require(__dirname + '/../support'),
   Support = require(__dirname + '/../support'),
-  dialect = Support.getTestDialect(),
   DataTypes = require(__dirname + '/../../../lib/data-types'),
   DataTypes = require(__dirname + '/../../../lib/data-types'),
   config = require(__dirname + '/../../config/config'),
   config = require(__dirname + '/../../config/config'),
   current = Support.sequelize;
   current = Support.sequelize;
@@ -140,36 +139,34 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
       });
       });
     });
     });
 
 
-    if (dialect === 'mysql') {
-      it('should update timestamps w milliseconds', function() {
-        const User = this.sequelize.define('User' + config.rand(), {
-          name: DataTypes.STRING,
-          bio: DataTypes.TEXT,
-          email: DataTypes.STRING,
-          createdAt: {type: DataTypes.DATE(6), allowNull: false},
-          updatedAt: {type: DataTypes.DATE(6), allowNull: false}
-        }, {
-          timestamps: true
-        });
+    it('should update timestamps with milliseconds', function() {
+      const User = this.sequelize.define('User' + config.rand(), {
+        name: DataTypes.STRING,
+        bio: DataTypes.TEXT,
+        email: DataTypes.STRING,
+        createdAt: {type: DataTypes.DATE(6), allowNull: false},
+        updatedAt: {type: DataTypes.DATE(6), allowNull: false}
+      }, {
+        timestamps: true
+      });
 
 
-        this.clock.tick(2100); //move the clock forward 2100 ms.
+      this.clock.tick(2100); //move the clock forward 2100 ms.
 
 
-        return User.sync({force: true}).then(() => {
-          return User.create({
-            name: 'snafu',
-            email: 'email'
-          }).then(user => {
-            return user.reload();
-          }).then(user => {
-            expect(user.get('name')).to.equal('snafu');
-            expect(user.get('email')).to.equal('email');
-            const testDate = new Date();
-            testDate.setTime(2100);
-            expect(user.get('createdAt')).to.equalTime(testDate);
-          });
+      return User.sync({force: true}).then(() => {
+        return User.create({
+          name: 'snafu',
+          email: 'email'
+        }).then(user => {
+          return user.reload();
+        }).then(user => {
+          expect(user.get('name')).to.equal('snafu');
+          expect(user.get('email')).to.equal('email');
+          const testDate = new Date();
+          testDate.setTime(2100);
+          expect(user.get('createdAt')).to.equalTime(testDate);
         });
         });
       });
       });
-    }
+    });
 
 
     it('should only save passed attributes', function() {
     it('should only save passed attributes', function() {
       const user = this.User.build();
       const user = this.User.build();