fix bug

yiisoft · Jul 16, 2020 · 2275449 · 2275449
1 parent 1e760fe
commit 2275449
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/ActiveQuery.php b/src/ActiveQuery.php
@@ -133,7 +133,7 @@ public function prepare()
      */
     public function all($db = null)
     {
-        return parent::all($db);
+        return parent::all($db === null ? $this->modelClass::GetDb() : null);
     }
 
     /**
@@ -146,7 +146,7 @@ public function all($db = null)
      */
     public function one($db = null)
     {
-        $row = parent::one($db);
+        $row = parent::one($db === null ? $this->modelClass::GetDb() : null);
         if ($row !== false) {
             $models = $this->populate([$row]);
             return reset($models) ?: null;
@@ -167,7 +167,7 @@ public function one($db = null)
      */
     public function modify($update, $options = [], $db = null)
     {
-        $row = parent::modify($update, $options, $db);
+        $row = parent::modify($update, $options, $db === null ? $this->modelClass::GetDb() : null);
         if ($row !== null) {
             $models = $this->populate([$row]);
             return reset($models) ?: null;
@@ -183,12 +183,11 @@ public function modify($update, $options = [], $db = null)
     public function getCollection($db = null)
     {
         /* @var $modelClass ActiveRecord */
-        $modelClass = $this->modelClass;
         if ($db === null) {
-            $db = $modelClass::getDb();
+            $db = $this->modelClass::getDb();
         }
         if ($this->from === null) {
-            $this->from = $modelClass::collectionName();
+            $this->from = $this->modelClass::collectionName();
         }
 
         return $db->getCollection($this->from);