Merge pull request #4414 from morozov/issues/4406

ResultCacheStatement::fetchAllAssociative does not store results in cache
doctrine · Nov 8, 2020 · 97ee7c4 · 97ee7c4
2 parents 3622d6d + 12508e6
commit 97ee7c4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 12 deletions.
diff --git a/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php b/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php
@@ -242,7 +242,9 @@ public function fetchAllNumeric(): array
             $data = $this->statement->fetchAll(FetchMode::ASSOCIATIVE);
         }
 
-        $this->store($data);
+        $this->data = $data;
+
+        $this->saveToCache();
 
         return array_map('array_values', $data);
     }
@@ -258,7 +260,9 @@ public function fetchAllAssociative(): array
             $data = $this->statement->fetchAll(FetchMode::ASSOCIATIVE);
         }
 
-        $this->store($data);
+        $this->data = $data;
+
+        $this->saveToCache();
 
         return $data;
     }
@@ -322,14 +326,6 @@ private function doFetch()
         return false;
     }
 
-    /**
-     * @param array<int,array<string,mixed>> $data
-     */
-    private function store(array $data): void
-    {
-        $this->data = $data;
-    }
-
     private function saveToCache(): void
     {
         if ($this->data === null) {

diff --git a/tests/Doctrine/Tests/DBAL/Functional/ResultCacheTest.php b/tests/Doctrine/Tests/DBAL/Functional/ResultCacheTest.php
@@ -4,6 +4,7 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
+use Doctrine\DBAL\Cache\ResultCacheStatement;
 use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\FetchMode;
 use Doctrine\DBAL\Logging\DebugStack;
@@ -212,7 +213,10 @@ public function testDontFinishNoCache(): void
         self::assertCount(2, $this->sqlLogger->queries);
     }
 
-    public function testFetchAllSavesCache(): void
+    /**
+     * @dataProvider fetchAllProvider
+     */
+    public function testFetchingAllRowsSavesCache(callable $fetchAll): void
     {
         $layerCache = new ArrayCache();
 
@@ -222,11 +226,42 @@ public function testFetchAllSavesCache(): void
             [],
             new QueryCacheProfile(0, 'testcachekey', $layerCache)
         );
-        $stmt->fetchAll();
+
+        $fetchAll($stmt);
 
         self::assertCount(1, $layerCache->fetch('testcachekey'));
     }
 
+    /**
+     * @return iterable<string,list<mixed>>
+     */
+    public static function fetchAllProvider(): iterable
+    {
+        yield 'fetchAll' => [
+            static function (ResultCacheStatement $statement): void {
+                $statement->fetchAll();
+            },
+        ];
+
+        yield 'fetchAllAssociative' => [
+            static function (ResultCacheStatement $statement): void {
+                $statement->fetchAllAssociative();
+            },
+        ];
+
+        yield 'fetchAllNumeric' => [
+            static function (ResultCacheStatement $statement): void {
+                $statement->fetchAllNumeric();
+            },
+        ];
+
+        yield 'fetchFirstColumn' => [
+            static function (ResultCacheStatement $result): void {
+                $result->fetchFirstColumn();
+            },
+        ];
+    }
+
     public function testFetchAllColumn(): void
     {
         $query = $this->connection->getDatabasePlatform()