Fix multiple join

EasyCorp · Jan 5, 2018 · e73afa4 · e73afa4
1 parent 984018f
commit e73afa4
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Search/QueryBuilder.php b/src/Search/QueryBuilder.php
@@ -88,10 +88,12 @@ public function createSearchQueryBuilder(array $entityConfig, $searchQuery, $sor
             ->from($entityConfig['class'], 'entity')
         ;
 
+        $joined = array();
         $isSortedByDoctrineAssociation = false !== strpos($sortField, '.');
         if ($isSortedByDoctrineAssociation) {
             $sortFieldParts = explode('.', $sortField);
             $queryBuilder->leftJoin('entity.'.$sortFieldParts[0], $sortFieldParts[0]);
+            $joined[] = $sortFieldParts[0];
         }
 
         $isSearchQueryNumeric = is_numeric($searchQuery);
@@ -106,9 +108,13 @@ public function createSearchQueryBuilder(array $entityConfig, $searchQuery, $sor
 
             if(strpos($name, '.') !== false) {
                 [$fieldPrefix, $name] = explode('.', $name);
-                $queryBuilder->join('entity.'.$fieldPrefix, $fieldPrefix);
+
+                if (!in_array($fieldPrefix, $joined)) {
+                    $queryBuilder->join('entity.'.$fieldPrefix, $fieldPrefix);
+                    $joined[] = $fieldPrefix;
+                }
             }
-            
+
             $isSmallIntegerField = 'smallint' === $metadata['dataType'];
             $isIntegerField = 'integer' === $metadata['dataType'];
             $isNumericField = in_array($metadata['dataType'], array('number', 'bigint', 'decimal', 'float'));