Fix fetchAll(obj) only getting one record.

Refs #12230
cakephp · Jun 13, 2018 · d50b557 · d50b557
1 parent f130611
commit d50b557
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Database/Statement/PDOStatement.php b/src/Database/Statement/PDOStatement.php
@@ -126,7 +126,7 @@ public function fetchAll($type = parent::FETCH_TYPE_NUM)
             return $this->_statement->fetchAll(PDO::FETCH_ASSOC);
         }
         if ($type === static::FETCH_TYPE_OBJ) {
-            return $this->_statement->fetch(PDO::FETCH_OBJ);
+            return $this->_statement->fetchAll(PDO::FETCH_OBJ);
         }
 
         return $this->_statement->fetchAll($type);

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -3660,7 +3660,7 @@ function ($q) {
         $result = $query
             ->select(['d' => $query->func()->now('date')])
             ->execute();
-        $this->assertEquals([['d' => date('Y-m-d')]], $result->fetchAll('assoc'));
+        $this->assertEquals([(object)['d' => date('Y-m-d')]], $result->fetchAll('obj'));
 
         $query = new Query($this->connection);
         $result = $query