From f385b98585bea34107360fea8c63b25eae3cfa03 Mon Sep 17 00:00:00 2001
From: Tigrov <rrr-r@ya.ru>
Date: Fri, 5 Apr 2024 09:29:14 +0700
Subject: [PATCH] Refactor `Query::column()`

---
 src/Query/Query.php              | 44 +++++++++++++++++---------------
 tests/Common/CommonQueryTest.php | 11 --------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/Query/Query.php b/src/Query/Query.php
index 8e1e49f06..75a06a849 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -16,7 +16,10 @@
 use Yiisoft\Db\Helper\DbArrayHelper;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 
+use function array_column;
+use function array_combine;
 use function array_key_exists;
+use function array_map;
 use function array_merge;
 use function array_shift;
 use function array_unshift;
@@ -252,39 +255,38 @@ public function column(): array
             return $this->createCommand()->queryColumn();
         }
 
-        if (is_string($this->indexBy) && count($this->select) === 1) {
-            if (!str_contains($this->indexBy, '.') && count($tables = $this->getTablesUsedInFrom()) > 0) {
-                $this->select[] = key($tables) . '.' . $this->indexBy;
-            } else {
-                $this->select[] = $this->indexBy;
+        if (is_string($this->indexBy)) {
+            if (count($this->select) === 1) {
+                if (!str_contains($this->indexBy, '.') && count($tables = $this->getTablesUsedInFrom()) > 0) {
+                    $this->select[] = key($tables) . '.' . $this->indexBy;
+                } else {
+                    $this->select[] = $this->indexBy;
+                }
             }
-        }
-
-        $rows = $this->createCommand()->queryAll();
-        $results = [];
-        $column = null;
 
-        if (is_string($this->indexBy)) {
             if (($dotPos = strpos($this->indexBy, '.')) === false) {
                 $column = $this->indexBy;
             } else {
                 $column = substr($this->indexBy, $dotPos + 1);
             }
-        }
 
-        /** @psalm-var array<array-key, array<string, string>> $rows */
-        foreach ($rows as $row) {
-            $value = reset($row);
+            $rows = $this->createCommand()->queryAll();
 
-            if ($this->indexBy instanceof Closure) {
-                /** @psalm-suppress MixedArrayOffset */
-                $results[($this->indexBy)($row)] = $value;
-            } else {
-                $results[$row[$column] ?? $row[$this->indexBy]] = $value;
+            if (empty($rows)) {
+                return [];
             }
+
+            return array_column($rows, key($rows[0]), $column);
+        }
+
+        $rows = $this->createCommand()->queryAll();
+
+        if (empty($rows)) {
+            return [];
         }
 
-        return $results;
+        /** @psalm-suppress MixedArgumentTypeCoercion */
+        return array_combine(array_map($this->indexBy, $rows), array_column($rows, key($rows[0])));
     }
 
     public function count(string $sql = '*'): int|string
diff --git a/tests/Common/CommonQueryTest.php b/tests/Common/CommonQueryTest.php
index 9906d9109..18d9769e9 100644
--- a/tests/Common/CommonQueryTest.php
+++ b/tests/Common/CommonQueryTest.php
@@ -10,17 +10,6 @@
 
 abstract class CommonQueryTest extends AbstractQueryTest
 {
-    public function testColumnWithIndexBy(): void
-    {
-        $db = $this->getConnection(true);
-
-        $query = (new Query($db))->select('customer.name')->from('customer')->indexBy('customer.id');
-
-        $this->assertSame([1 => 'user1', 2 => 'user2', 3 => 'user3'], $query->column());
-
-        $db->close();
-    }
-
     public function testColumnIndexByWithClosure()
     {
         $db = $this->getConnection(true);