fix: prevent adding same alias twice; doctrine does not like it

Author: pmattmann

src/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php

@@ -31,6 +31,7 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\Query\Expr\Select;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
@@ -264,7 +265,7 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
                     continue;
                 }
             } else {
-                $queryBuilder->addSelect($associationAlias);
+                $this->addSelectOnce($queryBuilder, $associationAlias);
             }
 
             // Avoid recursive joins for self-referencing relations
@@ -296,7 +297,7 @@ private function addSelect(QueryBuilder $queryBuilder, string $entity, string $a
         $entityManager = $queryBuilder->getEntityManager();
         $targetClassMetadata = $entityManager->getClassMetadata($entity);
         if (!empty($targetClassMetadata->subClasses)) {
-            $queryBuilder->addSelect($associationAlias);
+            $this->addSelectOnce($queryBuilder, $associationAlias);
 
             return;
         }
@@ -335,6 +336,17 @@ private function addSelect(QueryBuilder $queryBuilder, string $entity, string $a
         $queryBuilder->addSelect(sprintf('partial %s.{%s}', $associationAlias, implode(',', $select)));
     }
 
+    private function addSelectOnce(QueryBuilder $queryBuilder, string $alias)
+    {
+        $existingSelects = array_reduce($queryBuilder->getDQLPart('select') ?? [], function ($existing, $dqlSelect) {
+            return ($dqlSelect instanceof Select) ? array_merge($existing, $dqlSelect->getParts()) : $existing;
+        }, []);
+
+        if (!\in_array($alias, $existingSelects, true)) {
+            $queryBuilder->addSelect($alias);
+        }
+    }
+
     /**
      * Gets the serializer context.
      *

tests/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php

@@ -236,6 +236,7 @@ public function testApplyToItem()
         $queryBuilderProphecy->addSelect('partial relatedDummy4_a5.{id}')->shouldBeCalledTimes(1);
         $queryBuilderProphecy->addSelect('singleInheritanceRelation_a6')->shouldBeCalledTimes(1);
         $queryBuilderProphecy->getDQLPart('join')->willReturn([]);
+        $queryBuilderProphecy->getDQLPart('select')->willReturn([]);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true);
@@ -895,6 +896,7 @@ public function testApplyToCollectionNoPartial()
         $queryBuilderProphecy->addSelect('relatedDummy_a1')->shouldBeCalledTimes(1);
         $queryBuilderProphecy->addSelect('relatedDummy2_a2')->shouldBeCalledTimes(1);
         $queryBuilderProphecy->getDQLPart('join')->willReturn([]);
+        $queryBuilderProphecy->getDQLPart('select')->willReturn([]);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30);
@@ -960,6 +962,7 @@ private function doTestApplyToCollectionWithANonReadableButFetchEagerProperty(bo
         $queryBuilderProphecy->addSelect('relatedDummy_a1')->shouldBeCalledTimes(1);
         $queryBuilderProphecy->addSelect('relatedDummy2_a2')->shouldBeCalledTimes(1);
         $queryBuilderProphecy->getDQLPart('join')->willReturn([]);
+        $queryBuilderProphecy->getDQLPart('select')->willReturn([]);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30);
@@ -1004,6 +1007,7 @@ public function testApplyToCollectionWithExistingJoin(string $joinType): void
                 new Join($joinType, 'o.relatedDummy', 'existing_join_alias'),
             ],
         ]);
+        $queryBuilderProphecy->getDQLPart('select')->willReturn([]);
         $queryBuilderProphecy->addSelect('existing_join_alias')->shouldBeCalledTimes(1);
 
         $queryBuilder = $queryBuilderProphecy->reveal();