fix: force disabling fetch join collection on Doctrine ORM paginator …

…when the query has no max results set
Kreyu · Nov 22, 2023 · 94a64b4 · 94a64b4
1 parent 6ce880c
commit 94a64b4
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/Bridge/Doctrine/Orm/Query/DoctrineOrmProxyQuery.php b/src/Bridge/Doctrine/Orm/Query/DoctrineOrmProxyQuery.php
@@ -87,14 +87,16 @@ public function paginate(PaginationData $paginationData): void
      */
     public function getPagination(): PaginationInterface
     {
-        $paginator = $this->createPaginator();
+        $maxResults = $this->queryBuilder->getMaxResults();
+
+        $paginator = $this->createPaginator(forceDisabledFetchJoinCollection: null === $maxResults);
 
         try {
             return new Pagination(
                 items: $paginator->getIterator(),
                 currentPageNumber: $this->getCurrentPageNumber(),
                 totalItemCount: $paginator->count(),
-                itemNumberPerPage: $this->queryBuilder->getMaxResults(),
+                itemNumberPerPage: $maxResults,
             );
         } catch (CurrentPageOutOfRangeException) {
             $this->queryBuilder->setFirstResult(null);
@@ -105,7 +107,7 @@ public function getPagination(): PaginationInterface
 
     public function getItems(): iterable
     {
-        $paginator = $this->createPaginator();
+        $paginator = $this->createPaginator(forceDisabledFetchJoinCollection: true);
 
         $batchSize = $this->batchSize;
 
@@ -177,7 +179,7 @@ private function getCurrentPageNumber(): int
         return (int) ($firstResult / $maxResults) + 1;
     }
 
-    private function createPaginator(): Paginator
+    private function createPaginator(bool $forceDisabledFetchJoinCollection = false): Paginator
     {
         $rootEntity = current($this->queryBuilder->getRootEntities());
 
@@ -199,7 +201,13 @@ private function createPaginator(): Paginator
 
         $query->setHydrationMode($this->hydrationMode);
 
-        return new Paginator($query, $hasSingleIdentifierName && $hasJoins);
+        $fetchJoinCollection = $hasSingleIdentifierName && $hasJoins;
+
+        if ($forceDisabledFetchJoinCollection) {
+            $fetchJoinCollection = false;
+        }
+
+        return new Paginator($query, $fetchJoinCollection);
     }
 
     private function applyQueryHints(Query $query): void