From eb86ae2b761627d5c6e02b89dca57ae7f67f4b31 Mon Sep 17 00:00:00 2001
From: vagusX <vagusX@users.noreply.github.com>
Date: Thu, 11 May 2023 12:01:39 +0800
Subject: [PATCH] fix: remove unscoped fn in src/adapters/sequelize.js (#387)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: remove unscoped fn in src/adapters/sequelize.js

* test: 修改 unscoped() 相关单测

* test: 修改 unscoped() 相关单测 again

---------

Co-authored-by: Chen Yangjian <252317+cyjake@users.noreply.github.com>
---
 src/adapters/sequelize.d.ts          | 2 +-
 src/adapters/sequelize.js            | 4 ----
 test/types/sequelize.test.ts         | 2 +-
 test/unit/adapters/sequelize.test.js | 6 +++---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/adapters/sequelize.d.ts b/src/adapters/sequelize.d.ts
index 302d706e..baed4237 100644
--- a/src/adapters/sequelize.d.ts
+++ b/src/adapters/sequelize.d.ts
@@ -107,7 +107,7 @@ export class SequelizeBone extends AbstractBone {
    */
   static scope<T extends typeof SequelizeBone>(this: T, name?: (string | ((...args: any[]) => SequelizeConditions<T>) | SequelizeConditions<T> | Array<SequelizeConditions<T>>), ...args: any[]): T;
 
-  static unscoped(): Spell<typeof SequelizeBone>;
+  static get unscoped(): Spell<typeof SequelizeBone>;
 
   /**
    * @deprecated scope is not recommended to use
diff --git a/src/adapters/sequelize.js b/src/adapters/sequelize.js
index e74491ac..498a49fc 100644
--- a/src/adapters/sequelize.js
+++ b/src/adapters/sequelize.js
@@ -176,10 +176,6 @@ module.exports = function sequelize(Bone) {
       return this.scope();
     }
 
-    static unscoped() {
-      return this.scope();
-    }
-
     /**
      * @deprecated scope is not recommended to use
      * @static
diff --git a/test/types/sequelize.test.ts b/test/types/sequelize.test.ts
index be7765a0..61abf5f0 100644
--- a/test/types/sequelize.test.ts
+++ b/test/types/sequelize.test.ts
@@ -971,7 +971,7 @@ describe('=> sequelize (TypeScript)', function() {
       assert.ok(!!(MyPost as any)._scopes.dk);
       assert.deepEqual((MyPost as any)._scopes.dk, (Scopped as any)._scope);
 
-      const Scopped1 = Scopped.unscoped();
+      const Scopped1 = Scopped.unscoped;
       assert.ok(!(Scopped1 as any)._scope);
 
     });
diff --git a/test/unit/adapters/sequelize.test.js b/test/unit/adapters/sequelize.test.js
index 54a23a81..5f2beef6 100644
--- a/test/unit/adapters/sequelize.test.js
+++ b/test/unit/adapters/sequelize.test.js
@@ -1346,9 +1346,9 @@ describe('Model scope', () => {
     );
   });
 
-  it('unscoped() should work', function() {
+  it('getter unscoped should work', function() {
     assert.equal(
-      MyPost.scope('MHW').unscoped().where({ title: 'New Post' }).toString(),
+      MyPost.scope('MHW').unscoped.where({ title: 'New Post' }).toString(),
       'SELECT * FROM "articles" WHERE "title" = \'New Post\' AND "gmt_deleted" IS NULL'
     );
   });
@@ -1409,7 +1409,7 @@ describe('Model scope', () => {
     );
 
     assert.equal(
-      User.unscoped().where({ nickname: 'OldHunter' }).toString(),
+      User.unscoped.where({ nickname: 'OldHunter' }).toString(),
       'SELECT * FROM "users" WHERE "nickname" = \'OldHunter\''
     );