+ Query::searchOne for redefining

hiqdev · Jan 26, 2017 · 5cb9c71 · 5cb9c71
1 parent dfb1362
commit 5cb9c71
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/ActiveQuery.php b/src/ActiveQuery.php
@@ -66,7 +66,7 @@ public function createCommand($db = null)
             // lazy loading
             if (is_array($this->via)) {
                 // via relation
-                /* @var $viaQuery ActiveQuery */
+                /** @var $viaQuery ActiveQuery */
                 list($viaName, $viaQuery) = $this->via;
                 if ($viaQuery->multiple) {
                     $viaModels = $viaQuery->all();
@@ -245,9 +245,13 @@ public function addSelect($columns)
      */
     public function one($db = null)
     {
-        $row = parent::one($db);
+        if ($this->asArray) {
+            return parent::one($db);
+        }
+
+        $row = $this->searchOne($db);
 
-        return $this->asArray ? $row : reset($this->populate([$row]));
+        return reset($this->populate([$row]));
     }
 
     /**

diff --git a/src/Query.php b/src/Query.php
@@ -66,6 +66,11 @@ public function createCommand($db = null)
     }
 
     public function one($db = null)
+    {
+        return $this->searchOne($db);
+    }
+
+    public function searchOne($db = null)
     {
         return $this->limit(1)->addOption('batch', false)->search();
     }