Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/Doctrine/Orm/Tests/Util/QueryCheckerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,33 @@ public function testHasOrderByOnFetchJoinedToManyAssociationWithJoinByAssociatio
$this->assertTrue(QueryChecker::hasOrderByOnFetchJoinedToManyAssociation($queryBuilder, $managerRegistryProphecy->reveal()));
}

public function testHasOrderByOnFetchJoinedToManyAssociationWithSqlFunctionInOrderBy(): void
{
$dummyMetadata = new ClassMetadata(Dummy::class);
$dummyMetadata->mapManyToMany([
'fieldName' => 'relatedDummies',
'targetEntity' => RelatedDummy::class,
]);

$relatedDummyMetadata = new ClassMetadata(RelatedDummy::class);

$entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
$entityManagerProphecy->getClassMetadata(RelatedDummy::class)->willReturn($relatedDummyMetadata);

$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
$queryBuilder->select('d', 'a_1');
$queryBuilder->from(Dummy::class, 'd');
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
$queryBuilder->addOrderBy("find_in_set(d.name, 'INTERVIEW')", 'ASC');

$managerRegistryProphecy = $this->prophesize(ManagerRegistry::class);
$managerRegistryProphecy->getManagerForClass(Dummy::class)->willReturn($entityManagerProphecy);
$managerRegistryProphecy->getManagerForClass(RelatedDummy::class)->willReturn($entityManagerProphecy);

$this->assertFalse(QueryChecker::hasOrderByOnFetchJoinedToManyAssociation($queryBuilder, $managerRegistryProphecy->reveal()));
}

public function testHasJoinedToManyAssociationWithoutJoin(): void
{
$entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
Expand Down
3 changes: 3 additions & 0 deletions src/Doctrine/Orm/Util/QueryChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ public static function hasOrderByOnFetchJoinedToManyAssociation(QueryBuilder $qu
if (str_contains((string) $part, '.')) {
[$alias] = explode('.', (string) $part);

// strip leading SQL function call, e.g. "find_in_set(t.type, ...)" → "t"
$alias = str_contains($alias, '(') ? substr($alias, strpos($alias, '(') + 1) : $alias;

$orderByAliases[] = $alias;
}
}
Expand Down
Loading