Added result caching for QueryBuilder and fetch/iterate methods in Co…

…nnection
doctrine · Jul 26, 2022 · d346acf · d346acf
1 parent de42378
commit d346acf
Show file tree

Hide file tree

Showing 2 changed files with 202 additions and 49 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -526,9 +526,13 @@ public function setAutoCommit($autoCommit)
      *
      * @throws Exception
      */
-    public function fetchAssociative(string $query, array $params = [], array $types = [])
-    {
-        return $this->executeQuery($query, $params, $types)->fetchAssociative();
+    public function fetchAssociative(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ) {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchAssociative();
     }
 
     /**
@@ -543,9 +547,13 @@ public function fetchAssociative(string $query, array $params = [], array $types
      *
      * @throws Exception
      */
-    public function fetchNumeric(string $query, array $params = [], array $types = [])
-    {
-        return $this->executeQuery($query, $params, $types)->fetchNumeric();
+    public function fetchNumeric(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ) {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchNumeric();
     }
 
     /**
@@ -560,9 +568,13 @@ public function fetchNumeric(string $query, array $params = [], array $types = [
      *
      * @throws Exception
      */
-    public function fetchOne(string $query, array $params = [], array $types = [])
-    {
-        return $this->executeQuery($query, $params, $types)->fetchOne();
+    public function fetchOne(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ) {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchOne();
     }
 
     /**
@@ -828,9 +840,13 @@ public function quote($value, $type = ParameterType::STRING)
      *
      * @throws Exception
      */
-    public function fetchAllNumeric(string $query, array $params = [], array $types = []): array
-    {
-        return $this->executeQuery($query, $params, $types)->fetchAllNumeric();
+    public function fetchAllNumeric(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): array {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchAllNumeric();
     }
 
     /**
@@ -844,9 +860,13 @@ public function fetchAllNumeric(string $query, array $params = [], array $types
      *
      * @throws Exception
      */
-    public function fetchAllAssociative(string $query, array $params = [], array $types = []): array
-    {
-        return $this->executeQuery($query, $params, $types)->fetchAllAssociative();
+    public function fetchAllAssociative(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): array {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchAllAssociative();
     }
 
     /**
@@ -861,9 +881,13 @@ public function fetchAllAssociative(string $query, array $params = [], array $ty
      *
      * @throws Exception
      */
-    public function fetchAllKeyValue(string $query, array $params = [], array $types = []): array
-    {
-        return $this->executeQuery($query, $params, $types)->fetchAllKeyValue();
+    public function fetchAllKeyValue(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): array {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchAllKeyValue();
     }
 
     /**
@@ -879,9 +903,13 @@ public function fetchAllKeyValue(string $query, array $params = [], array $types
      *
      * @throws Exception
      */
-    public function fetchAllAssociativeIndexed(string $query, array $params = [], array $types = []): array
-    {
-        return $this->executeQuery($query, $params, $types)->fetchAllAssociativeIndexed();
+    public function fetchAllAssociativeIndexed(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): array {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchAllAssociativeIndexed();
     }
 
     /**
@@ -895,9 +923,13 @@ public function fetchAllAssociativeIndexed(string $query, array $params = [], ar
      *
      * @throws Exception
      */
-    public function fetchFirstColumn(string $query, array $params = [], array $types = []): array
-    {
-        return $this->executeQuery($query, $params, $types)->fetchFirstColumn();
+    public function fetchFirstColumn(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): array {
+        return $this->executeQuery($query, $params, $types, $qcp)->fetchFirstColumn();
     }
 
     /**
@@ -911,9 +943,13 @@ public function fetchFirstColumn(string $query, array $params = [], array $types
      *
      * @throws Exception
      */
-    public function iterateNumeric(string $query, array $params = [], array $types = []): Traversable
-    {
-        return $this->executeQuery($query, $params, $types)->iterateNumeric();
+    public function iterateNumeric(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): Traversable {
+        return $this->executeQuery($query, $params, $types, $qcp)->iterateNumeric();
     }
 
     /**
@@ -928,9 +964,13 @@ public function iterateNumeric(string $query, array $params = [], array $types =
      *
      * @throws Exception
      */
-    public function iterateAssociative(string $query, array $params = [], array $types = []): Traversable
-    {
-        return $this->executeQuery($query, $params, $types)->iterateAssociative();
+    public function iterateAssociative(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): Traversable {
+        return $this->executeQuery($query, $params, $types, $qcp)->iterateAssociative();
     }
 
     /**
@@ -945,9 +985,13 @@ public function iterateAssociative(string $query, array $params = [], array $typ
      *
      * @throws Exception
      */
-    public function iterateKeyValue(string $query, array $params = [], array $types = []): Traversable
-    {
-        return $this->executeQuery($query, $params, $types)->iterateKeyValue();
+    public function iterateKeyValue(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): Traversable {
+        return $this->executeQuery($query, $params, $types, $qcp)->iterateKeyValue();
     }
 
     /**
@@ -963,9 +1007,13 @@ public function iterateKeyValue(string $query, array $params = [], array $types
      *
      * @throws Exception
      */
-    public function iterateAssociativeIndexed(string $query, array $params = [], array $types = []): Traversable
-    {
-        return $this->executeQuery($query, $params, $types)->iterateAssociativeIndexed();
+    public function iterateAssociativeIndexed(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): Traversable {
+        return $this->executeQuery($query, $params, $types, $qcp)->iterateAssociativeIndexed();
     }
 
     /**
@@ -979,9 +1027,13 @@ public function iterateAssociativeIndexed(string $query, array $params = [], arr
      *
      * @throws Exception
      */
-    public function iterateColumn(string $query, array $params = [], array $types = []): Traversable
-    {
-        return $this->executeQuery($query, $params, $types)->iterateColumn();
+    public function iterateColumn(
+        string $query,
+        array $params = [],
+        array $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): Traversable {
+        return $this->executeQuery($query, $params, $types, $qcp)->iterateColumn();
     }
 
     /**