fix: remove unscoped fn in src/adapters/sequelize.js (#387)

* fix: remove unscoped fn in src/adapters/sequelize.js * test: 修改 unscoped() 相关单测 * test: 修改 unscoped() 相关单测 again --------- Co-authored-by: Chen Yangjian <[email protected]>
cyjake · May 11, 2023 · eb86ae2 · eb86ae2
1 parent ddcefbc
commit eb86ae2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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\''
     );