Merge pull request #1636 from soyuka/hotfix/filter-eager-loading-ext

fix FilterEagerLoadingExtension do not remove where clause if it did …

Author: soyuka

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

@@ -62,12 +62,14 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
 
         $queryBuilderClone = clone $queryBuilder;
         $queryBuilderClone->resetDQLPart('where');
+        $changedWhereClause = false;
 
         if (!$classMetadata->isIdentifierComposite) {
             $replacementAlias = $queryNameGenerator->generateJoinAlias($originAlias);
             $in = $this->getQueryBuilderWithNewAliases($queryBuilder, $queryNameGenerator, $originAlias, $replacementAlias);
             $in->select($replacementAlias);
             $queryBuilderClone->andWhere($queryBuilderClone->expr()->in($originAlias, $in->getDQL()));
+            $changedWhereClause = true;
         } else {
             // Because Doctrine doesn't support WHERE ( foo, bar ) IN () (https://github.com/doctrine/doctrine2/issues/5238), we are building as many subqueries as they are identifiers
             foreach ($classMetadata->getIdentifier() as $identifier) {
@@ -79,9 +81,14 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
                 $in = $this->getQueryBuilderWithNewAliases($queryBuilder, $queryNameGenerator, $originAlias, $replacementAlias);
                 $in->select("IDENTITY($replacementAlias.$identifier)");
                 $queryBuilderClone->andWhere($queryBuilderClone->expr()->in("$originAlias.$identifier", $in->getDQL()));
+                $changedWhereClause = true;
             }
         }
 
+        if (false === $changedWhereClause) {
+            return;
+        }
+
         $queryBuilder->resetDQLPart('where');
         $queryBuilder->add('where', $queryBuilderClone->getDQLPart('where'));
     }

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

@@ -358,7 +358,7 @@ public function testFetchEagerWithNoForceEager()
         $this->assertEquals($this->toDQLString($expected), $qb->getDQL());
     }
 
-    public function testCompositeIdentifiersWithoutAssociation()
+    public function testCompositeIdentifiersWithAssociation()
     {
         $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);
         $resourceMetadataFactoryProphecy->create(CompositeRelation::class)->willReturn(new ResourceMetadata(CompositeRelation::class));
@@ -416,6 +416,48 @@ public function testCompositeIdentifiersWithoutAssociation()
         $this->assertEquals($this->toDQLString($expected), $qb->getDQL());
     }
 
+    public function testCompositeIdentifiersWithoutAssociation()
+    {
+        $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);
+        $resourceMetadataFactoryProphecy->create(CompositeRelation::class)->willReturn(new ResourceMetadata(CompositeRelation::class));
+
+        $classMetadataProphecy = $this->prophesize(ClassMetadataInfo::class);
+        $classMetadataProphecy->getIdentifier()->willReturn(['foo', 'bar']);
+        $classMetadataProphecy->getAssociationMappings()->willReturn(['item' => ['fetch' => ClassMetadataInfo::FETCH_EAGER]]);
+        $classMetadataProphecy->hasAssociation('foo')->shouldBeCalled()->willReturn(false);
+        $classMetadataProphecy->hasAssociation('bar')->shouldBeCalled()->willReturn(false);
+
+        $classMetadata = $classMetadataProphecy->reveal();
+        $classMetadata->isIdentifierComposite = true;
+
+        $em = $this->prophesize(EntityManager::class);
+        $em->getClassMetadata(CompositeRelation::class)->shouldBeCalled()->willReturn($classMetadata);
+
+        $qb = new QueryBuilder($em->reveal());
+
+        $qb->select('o')
+            ->from(CompositeRelation::class, 'o')
+            ->innerJoin('o.compositeItem', 'item')
+            ->innerJoin('o.compositeLabel', 'label')
+            ->where('item.field1 = :foo AND o.bar = :bar')
+            ->setParameter('foo', 1)
+            ->setParameter('bar', 2);
+
+        $queryNameGenerator = $this->prophesize(QueryNameGeneratorInterface::class);
+        $filterEagerLoadingExtension = new FilterEagerLoadingExtension($resourceMetadataFactoryProphecy->reveal(), true);
+        $filterEagerLoadingExtension->applyToCollection($qb, $queryNameGenerator->reveal(), CompositeRelation::class, 'get');
+
+        $expected = <<<SQL
+SELECT o
+FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeRelation o
+INNER JOIN o.compositeItem item
+INNER JOIN o.compositeLabel label
+WHERE item.field1 = :foo AND o.bar = :bar
+SQL;
+
+        $this->assertEquals($this->toDQLString($expected), $qb->getDQL());
+    }
+
     private function toDQLString(string $dql): string
     {
         return preg_replace(['/\s+/', '/\(\s/', '/\s\)/'], [' ', '(', ')'], $dql);