fix(QueryBuilder): where(Closure) 生成的语句排除默认范围查询

twinh · Nov 2, 2023 · 4255288 · 4255288
1 parent 9b743a1
commit 4255288
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/Db/QueryBuilderTrait.php b/lib/Db/QueryBuilderTrait.php
@@ -1616,6 +1616,8 @@ protected function addWhere(
                 'wei' => $this->wei,
                 'db' => $this->getDb(),
                 'table' => $this->getTable(),
+                // NOTE: Remove default scopes for model
+                'withoutScopes' => true,
             ]);
             $column($query);
             $column = $query;

diff --git a/tests/unit/Model/DefaultScopeTraitTest.php b/tests/unit/Model/DefaultScopeTraitTest.php
@@ -112,9 +112,11 @@ public function testUnscopeMulti()
     public function testScopeWithClosure()
     {
         $scope = TestDefaultScope::where(function (TestDefaultScope $defaultScope) {
-            $defaultScope->unscoped();
             $defaultScope->where('name', 'test');
         });
+
+        $this->assertStringNotContainsString('(`active` = 1', $scope->getRawSql());
+
         $this->assertStringContainsString(
             "WHERE `active` = 1 AND `type` = 'A' AND (`name` = 'test')",
             $scope->getRawSql()