Disable eager loading when no groups are specified to avoid recursive joins

abluchet · abluchet · commit 000f6dfec5ec · 2018-06-05T14:04:38.000+02:00
diff --git a/features/main/circular_reference.feature b/features/main/circular_reference.feature
@@ -61,7 +61,8 @@ Feature: Circular references handling
           "@type": "CircularReference",
           "parent": "/circular_references/1",
           "children": [
-              "/circular_references/1"
+              "/circular_references/1",
+              "/circular_references/2"
           ]
       },
       "children": []
diff --git a/src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php b/src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php
@@ -107,6 +107,10 @@ private function apply(bool $collection, QueryBuilder $queryBuilder, QueryNameGe
             $context += $this->getNormalizationContext($context['resource_class'] ?? $resourceClass, $contextType, $options);
         }
 
+        if (empty($context[AbstractNormalizer::GROUPS]) && !isset($context[AbstractNormalizer::ATTRIBUTES])) {
+            return;
+        }
+
         $this->joinRelations($queryBuilder, $queryNameGenerator, $resourceClass, $forceEager, $fetchPartial, $queryBuilder->getRootAliases()[0], $options, $context);
     }
 
diff --git a/tests/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php b/tests/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,10 @@ private function apply(bool $collection, QueryBuilder $queryBuilder, QueryNameGe`
`107`	`107`	`$context += $this->getNormalizationContext($context['resource_class'] ?? $resourceClass, $contextType, $options);`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ if (empty($context[AbstractNormalizer::GROUPS]) && !isset($context[AbstractNormalizer::ATTRIBUTES])) {`
	`111`	`+ return;`
	`112`	`+ }`
	`113`	`+`
`110`	`114`	`$this->joinRelations($queryBuilder, $queryNameGenerator, $resourceClass, $forceEager, $fetchPartial, $queryBuilder->getRootAliases()[0], $options, $context);`
`111`	`115`	`}`
`112`	`116`