fix bug

Author: ziaratban

src/ActiveQuery.php

@@ -93,6 +93,19 @@ public function init()
         $this->trigger(self::EVENT_INIT);
     }
 
+    /**
+     * Returns the connection used by this ActiveQuery.
+     * @param Connection $db Mongo connection.
+     * @return Connection connection instance.
+     */
+    public function getDb($db = null){
+        if($db !== null){
+            return $db;
+        }
+        $modelClass = $this->modelClass;
+        return $modelClass::getDb();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -183,15 +196,13 @@ public function modify($update, $options = [], $db = null)
     public function getCollection($db = null)
     {
         /* @var $modelClass ActiveRecord */
-        $modelClass = $this->modelClass;
-        if ($db === null) {
-            $db = $modelClass::getDb();
-        }
+
         if ($this->from === null) {
+            $modelClass = $this->modelClass;
             $this->from = $modelClass::collectionName();
         }
 
-        return $db->getCollection($this->from);
+        return $this->getDb()->getCollection($this->from);
     }
 
     /**

src/Query.php

@@ -60,6 +60,14 @@ class Query extends Component implements QueryInterface
      */
     public $options = [];
 
+    /**
+     * Returns the connection used by this Query.
+     * @param Connection $db Mongo connection.
+     * @return Connection connection instance.
+     */
+    public function getDb($db = null){
+        return $db === null ? $db : Yii::$app->get('mongodb');
+    }
 
     /**
      * Returns the Mongo collection for this query.
@@ -68,11 +76,7 @@ class Query extends Component implements QueryInterface
      */
     public function getCollection($db = null)
     {
-        if ($db === null) {
-            $db = Yii::$app->get('mongodb');
-        }
-
-        return $db->getCollection($this->from);
+        return $this->getDb($db)->getCollection($this->from);
     }
 
     /**
@@ -210,9 +214,7 @@ public function buildCursor($db = null)
      */
     protected function fetchRows($all = true, $db = null)
     {
-        if ($db === null) {
-            $db = Yii::$app->get('mongodb');
-        }
+        $db = $this->getDb($db);
         $cursor = $this->buildCursor($db);
         $token = 'fetch cursor id = ' . $cursor->getId();
         if ($db->enableLogging) {
@@ -288,7 +290,7 @@ public function batch($batchSize = 100, $db = null)
             'class' => BatchQueryResult::className(),
             'query' => $this,
             'batchSize' => $batchSize,
-            'db' => $db,
+            'db' => $this->getDb($db),
             'each' => false,
         ]);
     }
@@ -316,7 +318,7 @@ public function each($batchSize = 100, $db = null)
             'class' => BatchQueryResult::className(),
             'query' => $this,
             'batchSize' => $batchSize,
-            'db' => $db,
+            'db' => $this->getDb($db),
             'each' => true,
         ]);
     }