diff --git a/Doctrine/Orm/Filter/OrderFilter.php b/Doctrine/Orm/Filter/OrderFilter.php index b6fb087e6c2..2fc2d6f4c35 100644 --- a/Doctrine/Orm/Filter/OrderFilter.php +++ b/Doctrine/Orm/Filter/OrderFilter.php @@ -79,7 +79,7 @@ public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder, R foreach ($propertyParts['associations'] as $association) { $alias = QueryNameGenerator::generateJoinAlias($association); - $queryBuilder->join(sprintf('%s.%s', $parentAlias, $association), $alias); + $queryBuilder->leftJoin(sprintf('%s.%s', $parentAlias, $association), $alias); $parentAlias = $alias; } diff --git a/Tests/Doctrine/Orm/Filter/OrderFilterTest.php b/Tests/Doctrine/Orm/Filter/OrderFilterTest.php index 61f7f98cc6e..0a386347141 100644 --- a/Tests/Doctrine/Orm/Filter/OrderFilterTest.php +++ b/Tests/Doctrine/Orm/Filter/OrderFilterTest.php @@ -283,7 +283,7 @@ public function filterProvider() 'relatedDummy.symfony' => 'desc', ], ], - 'SELECT o FROM Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy o INNER JOIN o.relatedDummy relatedDummy_123456abcdefg ORDER BY o.id ASC, o.name DESC, relatedDummy_123456abcdefg.symfony DESC', + 'SELECT o FROM Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy o LEFT JOIN o.relatedDummy relatedDummy_123456abcdefg ORDER BY o.id ASC, o.name DESC, relatedDummy_123456abcdefg.symfony DESC', ], // Properties enabled with empty request (default values) [