Merge pull request api-platform#1311 from soyuka/fix/1310

fix api-platform#1310 join condition aliases in FilterEagerLoadingExtension

Author: Simperfit

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

@@ -118,7 +118,7 @@ private function getQueryBuilderWithNewAliases(QueryBuilder $queryBuilder, Query
             $aliases[] = "{$joinPart->getAlias()}.";
             $alias = $queryNameGenerator->generateJoinAlias($joinPart->getAlias());
             $replacements[] = "$alias.";
-            $join = new Join($joinPart->getJoinType(), str_replace($aliases, $replacements, $joinPart->getJoin()), $alias, $joinPart->getConditionType(), $joinPart->getCondition(), $joinPart->getIndexBy());
+            $join = new Join($joinPart->getJoinType(), str_replace($aliases, $replacements, $joinPart->getJoin()), $alias, $joinPart->getConditionType(), str_replace($aliases, $replacements, $joinPart->getCondition()), $joinPart->getIndexBy());
 
             $queryBuilderClone->add('join', [$join], true);
         }

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

@@ -315,6 +315,7 @@ public function testFetchEagerWithNoForceEager()
             ->from(CompositeRelation::class, 'o')
             ->innerJoin('o.compositeItem', 'item')
             ->innerJoin('o.compositeLabel', 'label')
+            ->leftJoin('o.foo', 'foo', 'WITH', 'o.bar = item.foo')
             ->where('item.field1 = :foo')
             ->setParameter('foo', 1);
 
@@ -323,6 +324,8 @@ public function testFetchEagerWithNoForceEager()
         $queryNameGenerator->generateJoinAlias('label')->shouldBeCalled()->willReturn('label_2');
         $queryNameGenerator->generateJoinAlias('o')->shouldBeCalled()->willReturn('o_2');
 
+        $queryNameGenerator->generateJoinAlias('foo')->shouldBeCalled()->willReturn('foo_2');
+
         $filterEagerLoadingExtension = new FilterEagerLoadingExtension($resourceMetadataFactoryProphecy->reveal(), false);
         $filterEagerLoadingExtension->applyToCollection($qb, $queryNameGenerator->reveal(), CompositeRelation::class, 'get');
 
@@ -331,15 +334,18 @@ public function testFetchEagerWithNoForceEager()
 FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeRelation o
 INNER JOIN o.compositeItem item
 INNER JOIN o.compositeLabel label
+LEFT JOIN o.foo foo WITH o.bar = item.foo
 WHERE o.item IN(
     SELECT IDENTITY(o_2.item) FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeRelation o_2
     INNER JOIN o_2.compositeItem item_2
     INNER JOIN o_2.compositeLabel label_2
+    LEFT JOIN o_2.foo foo_2 WITH o_2.bar = item_2.foo
     WHERE item_2.field1 = :foo
 ) AND o.label IN(
     SELECT IDENTITY(o_2.label) FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeRelation o_2
     INNER JOIN o_2.compositeItem item_2
     INNER JOIN o_2.compositeLabel label_2
+    LEFT JOIN o_2.foo foo_2 WITH o_2.bar = item_2.foo
     WHERE item_2.field1 = :foo
 )
 SQL;