Merge pull request #1779 from joelwurtz/patch-1

Allow to deactivate fetch join collection

Author: dunglas

src/Bridge/Doctrine/Orm/Extension/PaginationExtension.php

@@ -144,7 +144,7 @@ public function supportsResult(string $resourceClass, string $operationName = nu
      */
     public function getResult(QueryBuilder $queryBuilder, string $resourceClass = null, string $operationName = null, array $context = [])
     {
-        $doctrineOrmPaginator = new DoctrineOrmPaginator($queryBuilder, $this->useFetchJoinCollection($queryBuilder));
+        $doctrineOrmPaginator = new DoctrineOrmPaginator($queryBuilder, $this->useFetchJoinCollection($queryBuilder, $resourceClass, $operationName));
         $doctrineOrmPaginator->setUseOutputWalkers($this->useOutputWalkers($queryBuilder));
 
         $resourceMetadata = null === $resourceClass ? null : $this->resourceMetadataFactory->create($resourceClass);
@@ -193,14 +193,20 @@ private function isPaginationEnabled(Request $request, ResourceMetadata $resourc
      * Determines whether the Paginator should fetch join collections, if the root entity uses composite identifiers it should not.
      *
      * @see https://github.com/doctrine/doctrine2/issues/2910
-     *
-     * @param QueryBuilder $queryBuilder
-     *
-     * @return bool
      */
-    private function useFetchJoinCollection(QueryBuilder $queryBuilder): bool
+    private function useFetchJoinCollection(QueryBuilder $queryBuilder, string $resourceClass = null, string $operationName = null): bool
     {
-        return !QueryChecker::hasRootEntityWithCompositeIdentifier($queryBuilder, $this->managerRegistry);
+        if (QueryChecker::hasRootEntityWithCompositeIdentifier($queryBuilder, $this->managerRegistry)) {
+            return false;
+        }
+
+        if (null === $resourceClass) {
+            return true;
+        }
+
+        $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
+
+        return  $resourceMetadata->getCollectionOperationAttribute($operationName, 'pagination_fetch_join_collection', true, true);
     }
 
     /**

tests/Bridge/Doctrine/Orm/Extension/PaginationExtensionTest.php

@@ -424,6 +424,14 @@ public function testGetResult()
         $this->assertInstanceOf(PaginatorInterface::class, $result);
     }
 
+    public function testGetResultWithoutFetchJoinCollection()
+    {
+        $result = $this->getPaginationExtensionResult(false, false, false);
+
+        $this->assertInstanceOf(PartialPaginatorInterface::class, $result);
+        $this->assertInstanceOf(PaginatorInterface::class, $result);
+    }
+
     public function testGetResultWithPartial()
     {
         $result = $this->getPaginationExtensionResult(true);
@@ -440,15 +448,15 @@ public function testSimpleGetResult()
         $this->assertInstanceOf(PaginatorInterface::class, $result);
     }
 
-    private function getPaginationExtensionResult(bool $partial = false, bool $legacy = false)
+    private function getPaginationExtensionResult(bool $partial = false, bool $legacy = false, bool $fetchJoinCollection = true)
     {
         $requestStack = new RequestStack();
         $requestStack->push(new Request(['partial' => $partial]));
 
         $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);
 
         if (!$legacy) {
-            $resourceMetadataFactoryProphecy->create('Foo')->willReturn(new ResourceMetadata(null, null, null, [], [], ['pagination_partial' => false, 'pagination_client_partial' => true]))->shouldBeCalled();
+            $resourceMetadataFactoryProphecy->create('Foo')->willReturn(new ResourceMetadata(null, null, null, [], [], ['pagination_partial' => false, 'pagination_client_partial' => true, 'pagination_fetch_join_collection' => $fetchJoinCollection]))->shouldBeCalled();
         }
 
         $configuration = new Configuration();