Allow setQueryBuilder() callable to return a custom QueryBuilder

ahmed-bhs · ahmed-bhs · commit 37b11a8b73be · 2026-02-10T16:34:05.000+01:00
The return value of the callable passed to setQueryBuilder() was ignored in AssociationConfigurator, making it impossible to replace the QueryBuilder with one that includes eager loading (leftJoin + addSelect). This caused N+1 queries when using group_by or choice_label that access related entities on each choice. Fixes EasyCorp#7434
diff --git a/src/Field/Configurator/AssociationConfigurator.php b/src/Field/Configurator/AssociationConfigurator.php
@@ -203,7 +203,7 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
                 // it would then be identical to the one used in autocomplete action, but it is a bit complex getting it in here
                 $queryBuilder = $repository->createQueryBuilder('entity');
                 if (null !== $queryBuilderCallable = $field->getCustomOption(AssociationField::OPTION_QUERY_BUILDER_CALLABLE)) {
-                    $queryBuilderCallable($queryBuilder);
+                    $queryBuilder = $queryBuilderCallable($queryBuilder) ?? $queryBuilder;
                 }
 
                 return $queryBuilder;

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c`
`203`	`203`	`// it would then be identical to the one used in autocomplete action, but it is a bit complex getting it in here`
`204`	`204`	`$queryBuilder = $repository->createQueryBuilder('entity');`
`205`	`205`	`if (null !== $queryBuilderCallable = $field->getCustomOption(AssociationField::OPTION_QUERY_BUILDER_CALLABLE)) {`
`206`		`- $queryBuilderCallable($queryBuilder);`
	`206`	`+ $queryBuilder = $queryBuilderCallable($queryBuilder) ?? $queryBuilder;`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`return $queryBuilder;`