fix: bulk destroy query conditions duplicated in sequelize mode (#295)

Co-authored-by: JimmyDaddy <[email protected]>
cyjake · Mar 21, 2022 · 90bb2c8 · 90bb2c8
1 parent e8378d5
commit 90bb2c8
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/src/adapters/sequelize.js b/src/adapters/sequelize.js
@@ -318,10 +318,12 @@ module.exports = Bone => {
     }
 
     // proxy to class.destroy({ individualHooks=false }) see https://github.com/sequelize/sequelize/blob/4063c2ab627ad57919d5b45cc7755f077a69fa5e/lib/model.js#L2895  before(after)BulkDestroy
-    static async bulkDestroy(options = {}) {
+    static bulkDestroy(options = {}) {
       const { where, force } = options;
       const spell = this._remove(where || {}, force, { ...options });
-      translateOptions(spell, options);
+      const transOptions = { ...options };
+      delete transOptions.where;
+      translateOptions(spell, transOptions);
       return spell;
     }
 

diff --git a/test/unit/adapters/sequelize.test.js b/test/unit/adapters/sequelize.test.js
@@ -2000,6 +2000,55 @@ describe('mysql only', () => {
     clock.restore();
   });
 
+  it('bulkDestroy should not duplicate query conditions', async () => {
+    const fakeDate = new Date(`2012-12-14 12:00:00`).getTime();
+    const clock = sinon.useFakeTimers(fakeDate);
+
+    assert.notEqual(Post.bulkDestroy({
+      where: {
+        title: 'halo',
+        $or: {
+          authorId: 1
+        }
+      },
+      limit: 2
+    }).toSqlString(), "UPDATE `articles` SET `gmt_deleted` = '2012-12-14 12:00:00.000' WHERE `title` = 'halo' AND `author_id` = 1 AND `title` = 'halo' AND `author_id` = 1 AND `gmt_deleted` IS NULL LIMIT 2");
+
+    assert.equal(Post.bulkDestroy({
+      where: {
+        title: 'halo',
+        $or: {
+          authorId: 1
+        }
+      },
+      limit: 2
+    }).toSqlString(), "UPDATE `articles` SET `gmt_deleted` = '2012-12-14 12:00:00.000' WHERE `title` = 'halo' AND `author_id` = 1 AND `gmt_deleted` IS NULL LIMIT 2");
+
+    assert.notEqual(Post.bulkDestroy({
+      where: {
+        title: 'halo',
+        $or: {
+          authorId: 1
+        }
+      },
+      limit: 2,
+      force: true,
+    }).toSqlString(), "DELETE FROM `articles` WHERE `title` = 'halo' AND `author_id` = 1 AND `title` = 'halo' AND `author_id` = 1 LIMIT 2");
+
+    assert.equal(Post.bulkDestroy({
+      where: {
+        title: 'halo',
+        $or: {
+          authorId: 1
+        }
+      },
+      limit: 2,
+      force: true,
+    }).toSqlString(), "DELETE FROM `articles` WHERE `title` = 'halo' AND `author_id` = 1 LIMIT 2");
+
+    clock.restore();
+  });
+
   describe('Model.destroy with order, limit (mysql only)', () => {
 
     it('should work', async () => {