Merge pull request #1527 from jdeniau/jd-fix-allowAnotherQueryBuilderAlias

meyerbaptiste · web-flow · commit 98b9a0227c5d · 2017-12-06T20:59:02.000+01:00
Allow another query builder alias
diff --git a/src/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php b/src/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php
@@ -54,7 +54,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
         }
 
         $joinParts = $queryBuilder->getDQLPart('join');
-        $originAlias = 'o';
+        $originAlias = $queryBuilder->getRootAliases()[0];
 
         if (!$joinParts || !isset($joinParts[$originAlias])) {
             return;
diff --git a/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php b/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php
@@ -41,6 +41,8 @@ public function __construct(string $order = null, ResourceMetadataFactoryInterfa
      */
     public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $operationName = null)
     {
+        $rootAlias = $queryBuilder->getRootAliases()[0];
+
         $classMetaData = $queryBuilder->getEntityManager()->getClassMetadata($resourceClass);
         $identifiers = $classMetaData->getIdentifier();
         if (null !== $this->resourceMetadataFactory) {
@@ -54,9 +56,9 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
                     }
                     if (false === ($pos = strpos($field, '.'))) {
                         // Configure default filter with property
-                        $field = 'o.'.$field;
+                        $field = "{$rootAlias}.{$field}";
                     } else {
-                        $alias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, 'o', substr($field, 0, $pos));
+                        $alias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, $rootAlias, substr($field, 0, $pos));
                         $field = sprintf('%s.%s', $alias, substr($field, $pos + 1));
                     }
                     $queryBuilder->addOrderBy($field, $order);
@@ -68,7 +70,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
 
         if (null !== $this->order) {
             foreach ($identifiers as $identifier) {
-                $queryBuilder->addOrderBy('o.'.$identifier, $this->order);
+                $queryBuilder->addOrderBy("{$rootAlias}.{$identifier}", $this->order);
             }
         }
     }
diff --git a/src/Bridge/Doctrine/Orm/Filter/BooleanFilter.php b/src/Bridge/Doctrine/Orm/Filter/BooleanFilter.php
@@ -89,7 +89,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             return;
         }
 
-        $alias = 'o';
+        $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
         if ($this->isPropertyNested($property, $resourceClass)) {
diff --git a/src/Bridge/Doctrine/Orm/Filter/DateFilter.php b/src/Bridge/Doctrine/Orm/Filter/DateFilter.php
@@ -85,7 +85,7 @@ protected function filterProperty(string $property, $values, QueryBuilder $query
             return;
         }
 
-        $alias = 'o';
+        $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
         if ($this->isPropertyNested($property, $resourceClass)) {
diff --git a/src/Bridge/Doctrine/Orm/Filter/ExistsFilter.php b/src/Bridge/Doctrine/Orm/Filter/ExistsFilter.php
@@ -92,7 +92,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             return;
         }
 
-        $alias = 'o';
+        $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
         if ($this->isPropertyNested($property, $resourceClass)) {
diff --git a/src/Bridge/Doctrine/Orm/Filter/NumericFilter.php b/src/Bridge/Doctrine/Orm/Filter/NumericFilter.php
@@ -111,7 +111,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             return;
         }
 
-        $alias = 'o';
+        $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
         if ($this->isPropertyNested($property, $resourceClass)) {
diff --git a/src/Bridge/Doctrine/Orm/Filter/OrderFilter.php b/src/Bridge/Doctrine/Orm/Filter/OrderFilter.php
@@ -119,7 +119,7 @@ protected function filterProperty(string $property, $direction, QueryBuilder $qu
             return;
         }
 
-        $alias = 'o';
+        $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
         if ($this->isPropertyNested($property, $resourceClass)) {
diff --git a/src/Bridge/Doctrine/Orm/Filter/RangeFilter.php b/src/Bridge/Doctrine/Orm/Filter/RangeFilter.php
@@ -70,7 +70,7 @@ protected function filterProperty(string $property, $values, QueryBuilder $query
             return;
         }
 
-        $alias = 'o';
+        $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
         if ($this->isPropertyNested($property, $resourceClass)) {
diff --git a/src/Bridge/Doctrine/Orm/Filter/SearchFilter.php b/src/Bridge/Doctrine/Orm/Filter/SearchFilter.php
@@ -184,7 +184,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             return;
         }
 
-        $alias = 'o';
+        $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
         if ($this->isPropertyNested($property, $resourceClass)) {
diff --git a/src/Bridge/Doctrine/Orm/ItemDataProvider.php b/src/Bridge/Doctrine/Orm/ItemDataProvider.php
@@ -108,10 +108,11 @@ public function getItem(string $resourceClass, $id, string $operationName = null
      */
     private function addWhereForIdentifiers(array $identifiers, QueryBuilder $queryBuilder, ClassMetadata $classMetadata)
     {
+        $alias = $queryBuilder->getRootAliases()[0];
         foreach ($identifiers as $identifier => $value) {
             $placeholder = ':id_'.$identifier;
             $expression = $queryBuilder->expr()->eq(
-                'o.'.$identifier,
+                "{$alias}.{$identifier}",
                 $placeholder
             );
 
diff --git a/src/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php b/src/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php
@@ -58,12 +58,13 @@ public static function addJoinOnce(QueryBuilder $queryBuilder, QueryNameGenerato
     private static function getExistingJoin(QueryBuilder $queryBuilder, string $alias, string $association)
     {
         $parts = $queryBuilder->getDQLPart('join');
+        $rootAlias = $queryBuilder->getRootAliases()[0];
 
-        if (!isset($parts['o'])) {
+        if (!isset($parts[$rootAlias])) {
             return null;
         }
 
-        foreach ($parts['o'] as $join) {
+        foreach ($parts[$rootAlias] as $join) {
             /** @var Join $join */
             if (sprintf('%s.%s', $alias, $association) === $join->getJoin()) {
                 return $join;
diff --git a/tests/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php b/tests/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php
@@ -123,6 +123,7 @@ public function testHasNoJoinPart()
         $qb = $this->prophesize(QueryBuilder::class);
         $qb->getDQLPart('where')->shouldBeCalled()->willReturn(new Expr\Andx());
         $qb->getDQLPart('join')->shouldBeCalled()->willReturn(null);
+        $qb->getRootAliases()->shouldBeCalled()->willReturn(['o']);
         $qb->getEntityManager()->willReturn($em);
 
         $queryNameGenerator = $this->prophesize(QueryNameGeneratorInterface::class);
diff --git a/tests/Bridge/Doctrine/Orm/Extension/OrderExtensionTest.php b/tests/Bridge/Doctrine/Orm/Extension/OrderExtensionTest.php
@@ -41,6 +41,7 @@ public function testApplyToCollectionWithValidOrder()
         $emProphecy->getClassMetadata(Dummy::class)->shouldBeCalled()->willReturn($classMetadataProphecy->reveal());
 
         $queryBuilderProphecy->getEntityManager()->shouldBeCalled()->willReturn($emProphecy->reveal());
+        $queryBuilderProphecy->getRootAliases()->shouldBeCalled()->willReturn(['o']);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $orderExtensionTest = new OrderExtension('asc');
@@ -60,6 +61,7 @@ public function testApplyToCollectionWithWrongOrder()
         $emProphecy->getClassMetadata(Dummy::class)->shouldBeCalled()->willReturn($classMetadataProphecy->reveal());
 
         $queryBuilderProphecy->getEntityManager()->shouldBeCalled()->willReturn($emProphecy->reveal());
+        $queryBuilderProphecy->getRootAliases()->shouldBeCalled()->willReturn(['o']);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $orderExtensionTest = new OrderExtension();
@@ -82,6 +84,7 @@ public function testApplyToCollectionWithOrderOverridden()
         $emProphecy->getClassMetadata(Dummy::class)->shouldBeCalled()->willReturn($classMetadataProphecy->reveal());
 
         $queryBuilderProphecy->getEntityManager()->shouldBeCalled()->willReturn($emProphecy->reveal());
+        $queryBuilderProphecy->getRootAliases()->shouldBeCalled()->willReturn(['o']);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $orderExtensionTest = new OrderExtension('asc', $resourceMetadataFactoryProphecy->reveal());
@@ -105,6 +108,7 @@ public function testApplyToCollectionWithOrderOverriddenWithNoDirection()
         $emProphecy->getClassMetadata(Dummy::class)->shouldBeCalled()->willReturn($classMetadataProphecy->reveal());
 
         $queryBuilderProphecy->getEntityManager()->shouldBeCalled()->willReturn($emProphecy->reveal());
+        $queryBuilderProphecy->getRootAliases()->shouldBeCalled()->willReturn(['o']);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $orderExtensionTest = new OrderExtension('asc', $resourceMetadataFactoryProphecy->reveal());
@@ -129,6 +133,7 @@ public function testApplyToCollectionWithOrderOverriddenWithAssociation()
         $emProphecy->getClassMetadata(Dummy::class)->shouldBeCalled()->willReturn($classMetadataProphecy->reveal());
 
         $queryBuilderProphecy->getEntityManager()->shouldBeCalled()->willReturn($emProphecy->reveal());
+        $queryBuilderProphecy->getRootAliases()->shouldBeCalled()->willReturn(['o']);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $orderExtensionTest = new OrderExtension('asc', $resourceMetadataFactoryProphecy->reveal());
diff --git a/tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php b/tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php
diff --git a/tests/Bridge/Doctrine/Orm/ItemDataProviderTest.php b/tests/Bridge/Doctrine/Orm/ItemDataProviderTest.php

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`$joinParts = $queryBuilder->getDQLPart('join');`
`57`		`- $originAlias = 'o';`
	`57`	`+ $originAlias = $queryBuilder->getRootAliases()[0];`
`58`	`58`
`59`	`59`	`if (!$joinParts \|\| !isset($joinParts[$originAlias])) {`
`60`	`60`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public function __construct(string $order = null, ResourceMetadataFactoryInterfa`
`41`	`41`	`*/`
`42`	`42`	`public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $operationName = null)`
`43`	`43`	`{`
	`44`	`+ $rootAlias = $queryBuilder->getRootAliases()[0];`
	`45`	`+`
`44`	`46`	`$classMetaData = $queryBuilder->getEntityManager()->getClassMetadata($resourceClass);`
`45`	`47`	`$identifiers = $classMetaData->getIdentifier();`
`46`	`48`	`if (null !== $this->resourceMetadataFactory) {`
`@@ -54,9 +56,9 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator`
`54`	`56`	`}`
`55`	`57`	`if (false === ($pos = strpos($field, '.'))) {`
`56`	`58`	`// Configure default filter with property`
`57`		`- $field = 'o.'.$field;`
	`59`	`+ $field = "{$rootAlias}.{$field}";`
`58`	`60`	`} else {`
`59`		`- $alias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, 'o', substr($field, 0, $pos));`
	`61`	`+ $alias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, $rootAlias, substr($field, 0, $pos));`
`60`	`62`	`$field = sprintf('%s.%s', $alias, substr($field, $pos + 1));`
`61`	`63`	`}`
`62`	`64`	`$queryBuilder->addOrderBy($field, $order);`
`@@ -68,7 +70,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator`
`68`	`70`
`69`	`71`	`if (null !== $this->order) {`
`70`	`72`	`foreach ($identifiers as $identifier) {`
`71`		`- $queryBuilder->addOrderBy('o.'.$identifier, $this->order);`
	`73`	`+ $queryBuilder->addOrderBy("{$rootAlias}.{$identifier}", $this->order);`
`72`	`74`	`}`
`73`	`75`	`}`
`74`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB`
`89`	`89`	`return;`
`90`	`90`	`}`
`91`	`91`
`92`		`- $alias = 'o';`
	`92`	`+ $alias = $queryBuilder->getRootAliases()[0];`
`93`	`93`	`$field = $property;`
`94`	`94`
`95`	`95`	`if ($this->isPropertyNested($property, $resourceClass)) {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected function filterProperty(string $property, $values, QueryBuilder $query`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`	`87`
`88`		`- $alias = 'o';`
	`88`	`+ $alias = $queryBuilder->getRootAliases()[0];`
`89`	`89`	`$field = $property;`
`90`	`90`
`91`	`91`	`if ($this->isPropertyNested($property, $resourceClass)) {`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB`
`92`	`92`	`return;`
`93`	`93`	`}`
`94`	`94`
`95`		`- $alias = 'o';`
	`95`	`+ $alias = $queryBuilder->getRootAliases()[0];`
`96`	`96`	`$field = $property;`
`97`	`97`
`98`	`98`	`if ($this->isPropertyNested($property, $resourceClass)) {`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB`
`111`	`111`	`return;`
`112`	`112`	`}`
`113`	`113`
`114`		`- $alias = 'o';`
	`114`	`+ $alias = $queryBuilder->getRootAliases()[0];`
`115`	`115`	`$field = $property;`
`116`	`116`
`117`	`117`	`if ($this->isPropertyNested($property, $resourceClass)) {`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ protected function filterProperty(string $property, $direction, QueryBuilder $qu`
`119`	`119`	`return;`
`120`	`120`	`}`
`121`	`121`
`122`		`- $alias = 'o';`
	`122`	`+ $alias = $queryBuilder->getRootAliases()[0];`
`123`	`123`	`$field = $property;`
`124`	`124`
`125`	`125`	`if ($this->isPropertyNested($property, $resourceClass)) {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected function filterProperty(string $property, $values, QueryBuilder $query`
`70`	`70`	`return;`
`71`	`71`	`}`
`72`	`72`
`73`		`- $alias = 'o';`
	`73`	`+ $alias = $queryBuilder->getRootAliases()[0];`
`74`	`74`	`$field = $property;`
`75`	`75`
`76`	`76`	`if ($this->isPropertyNested($property, $resourceClass)) {`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB`
`184`	`184`	`return;`
`185`	`185`	`}`
`186`	`186`
`187`		`- $alias = 'o';`
	`187`	`+ $alias = $queryBuilder->getRootAliases()[0];`
`188`	`188`	`$field = $property;`
`189`	`189`
`190`	`190`	`if ($this->isPropertyNested($property, $resourceClass)) {`
Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,13 @@ public static function addJoinOnce(QueryBuilder $queryBuilder, QueryNameGenerato`
`58`	`58`	`private static function getExistingJoin(QueryBuilder $queryBuilder, string $alias, string $association)`
`59`	`59`	`{`
`60`	`60`	`$parts = $queryBuilder->getDQLPart('join');`
	`61`	`+ $rootAlias = $queryBuilder->getRootAliases()[0];`
`61`	`62`
`62`		`- if (!isset($parts['o'])) {`
	`63`	`+ if (!isset($parts[$rootAlias])) {`
`63`	`64`	`return null;`
`64`	`65`	`}`
`65`	`66`
`66`		`- foreach ($parts['o'] as $join) {`
	`67`	`+ foreach ($parts[$rootAlias] as $join) {`
`67`	`68`	`/** @var Join $join */`
`68`	`69`	`if (sprintf('%s.%s', $alias, $association) === $join->getJoin()) {`
`69`	`70`	`return $join;`