From cf22ec8f353ce1982c07f085fe90d8afd4da4666 Mon Sep 17 00:00:00 2001
From: "Serg N. Kalachev" <serg@kalachev.ru>
Date: Sun, 16 Jun 2024 17:38:45 +0300
Subject: [PATCH] [PATCH] Erroneously fails to search when table names match

---
 src/Orm/EntityRepository.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Orm/EntityRepository.php b/src/Orm/EntityRepository.php
index 042dd0884c..07ee0dafde 100644
--- a/src/Orm/EntityRepository.php
+++ b/src/Orm/EntityRepository.php
@@ -262,13 +262,13 @@ private function getSearchablePropertiesConfig(QueryBuilder $queryBuilder, Searc
                 $associatedEntityAlias = $associatedPropertyName = '';
                 for ($i = 0; $i < $numAssociatedProperties - 1; ++$i) {
                     $associatedEntityName = $associatedProperties[$i];
-                    $associatedEntityAlias = Escaper::escapeDqlAlias($associatedEntityName);
+                    $associatedEntityAlias = Escaper::escapeDqlAlias($associatedEntityName).($i ?: '');
                     $associatedPropertyName = $associatedProperties[$i + 1];
 
-                    if (!\in_array($associatedEntityName, $entitiesAlreadyJoined, true)) {
+                    if (!\in_array($associatedEntityAlias, $entitiesAlreadyJoined, true)) {
                         $parentEntityName = 0 === $i ? 'entity' : $associatedProperties[$i - 1];
                         $queryBuilder->leftJoin(Escaper::escapeDqlAlias($parentEntityName).'.'.$associatedEntityName, $associatedEntityAlias);
-                        $entitiesAlreadyJoined[] = $associatedEntityName;
+                        $entitiesAlreadyJoined[] = $associatedEntityAlias;
                     }
 
                     if ($i < $numAssociatedProperties - 2) {