feat(model/update): support paranoid option (#8735)

lib/model.js

@@ -2589,6 +2589,7 @@ class Model {
    * @param  {Object}       values
    * @param  {Object}       values
    * @param  {Object}       options
    * @param  {Object}       options
    * @param  {Object}       options.where                   Options to describe the scope of the search.
    * @param  {Object}       options.where                   Options to describe the scope of the search.
+   * @param  {Boolean}      [options.paranoid=true] If true, only non-deleted records will be updated. If false, both deleted and non-deleted records will be updated. Only applies if `options.paranoid` is true for the model.
    * @param  {Array}        [options.fields]                Fields to update (defaults to all fields)
    * @param  {Array}        [options.fields]                Fields to update (defaults to all fields)
    * @param  {Boolean}      [options.validate=true]         Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails validation
    * @param  {Boolean}      [options.validate=true]         Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails validation
    * @param  {Boolean}      [options.hooks=true]            Run before / after bulk update hooks?
    * @param  {Boolean}      [options.hooks=true]            Run before / after bulk update hooks?
@@ -2607,14 +2608,14 @@ class Model {
     this._optionsMustContainWhere(options);
     this._optionsMustContainWhere(options);
 
 
     options = Utils.cloneDeep(options);
     options = Utils.cloneDeep(options);
-    options = _.defaults(options, {
+    options = this._paranoidClause(this, _.defaults(options, {
       validate: true,
       validate: true,
       hooks: true,
       hooks: true,
       individualHooks: false,
       individualHooks: false,
       returning: false,
       returning: false,
       force: false,
       force: false,
       sideEffects: true
       sideEffects: true
-    });
+    }));
 
 
     options.type = QueryTypes.BULKUPDATE;
     options.type = QueryTypes.BULKUPDATE;
 
 

test/integration/model.test.js

@@ -1135,6 +1135,67 @@ describe(Support.getTestDialectTeaser('Model'), () => {
       });
       });
     });
     });
 
 
+    it('does not update soft deleted records when model is paranoid', function() {
+      const ParanoidUser = this.sequelize.define('ParanoidUser', { username: DataTypes.STRING }, { paranoid: true });
+
+      return this.sequelize.sync({ force: true }).then(() => {
+        return ParanoidUser.bulkCreate([
+          { username: 'user1' },
+          { username: 'user2' }
+        ]);
+      }).then(() => {
+        return ParanoidUser.destroy({
+          where: {
+            username: 'user1'
+          }
+        });
+      }).then(() => {
+        return ParanoidUser.update({ username: 'foo' }, {
+          where: {}
+        });
+      }).then(() => {
+        return ParanoidUser.findAll({
+          paranoid: false,
+          where: {
+            username: 'foo'
+          }
+        });
+      }).then(users => {
+        expect(users).to.have.lengthOf(1, 'should not update soft-deleted record');
+      });
+    });
+
+    it('updates soft deleted records when paranoid is overridden', function() {
+      const ParanoidUser = this.sequelize.define('ParanoidUser', { username: DataTypes.STRING }, { paranoid: true });
+
+      return this.sequelize.sync({ force: true }).then(() => {
+        return ParanoidUser.bulkCreate([
+          { username: 'user1' },
+          { username: 'user2' }
+        ]);
+      }).then(() => {
+        return ParanoidUser.destroy({
+          where: {
+            username: 'user1'
+          }
+        });
+      }).then(() => {
+        return ParanoidUser.update({ username: 'foo' }, {
+          where: {},
+          paranoid: false
+        });
+      }).then(() => {
+        return ParanoidUser.findAll({
+          paranoid: false,
+          where: {
+            username: 'foo'
+          }
+        });
+      }).then(users => {
+        expect(users).to.have.lengthOf(2);
+      });
+    });
+
     if (dialect === 'postgres') {
     if (dialect === 'postgres') {
       it('returns the affected rows if `options.returning` is true', function() {
       it('returns the affected rows if `options.returning` is true', function() {
         const self = this,
         const self = this,