perf: remove useless GROUP BY columns when using SelectColumns

williarin · Jun 12, 2022 · 460bf0d · 460bf0d
1 parent 9d41d0d
commit 460bf0d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Bridge/Repository/AbstractEntityRepository.php b/src/Bridge/Repository/AbstractEntityRepository.php
@@ -105,13 +105,13 @@ public function createFindByQueryBuilder(array $criteria, ?array $orderBy): Quer
         $normalizedCriteria = $this->normalizeCriteria($criteria);
         $this->tableAliases['p'] = $this->getEntityBaseFields();
 
-        $prefixedEntityBaseField = $this->getPrefixedEntityBaseFields('p');
+        $prefixedEntityBaseFields = $this->getPrefixedEntityBaseFields('p');
 
         $queryBuilder = $this->entityManager->getConnection()
             ->createQueryBuilder()
-            ->select($prefixedEntityBaseField)
+            ->select($prefixedEntityBaseFields)
             ->from($this->entityManager->getTablesPrefix() . static::TABLE_NAME, 'p')
-            ->addGroupBy(...$prefixedEntityBaseField)
+            ->addGroupBy(...$prefixedEntityBaseFields)
         ;
 
         if (is_subclass_of($this->getEntityClassName(), BaseEntity::class)) {
@@ -498,6 +498,8 @@ private function selectColumns(QueryBuilder $queryBuilder, array $extraFields, S
         $selects = [];
         $hasExtraFields = false;
 
+        $queryBuilder->resetQueryPart('groupBy');
+
         foreach ($value->getColumns() as $column) {
             if (in_array($column, $extraFields, true)) {
                 $mappedMetaKey = $this->getMappedMetaKey($column);