改进column方法

top-think · Dec 23, 2019 · 37cde31 · 37cde31
1 parent 54a66ed
commit 37cde31
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/db/PDOConnection.php b/src/db/PDOConnection.php
@@ -1144,16 +1144,17 @@ public function column(BaseQuery $query, string $column, string $key = ''): arra
         } elseif (('*' == $column || strpos($column, ',')) && $key) {
             $result = array_column($resultSet, null, $key);
         } else {
-            $fields = array_keys($resultSet[0]);
-            $key    = $key ?: array_shift($fields);
+            if (empty($key)) {
+                $key = null;
+            }
 
             if (strpos($column, ',')) {
                 $column = null;
             } elseif (strpos($column, '.')) {
                 [$alias, $column] = explode('.', $column);
             }
 
-            if (strpos($key, '.')) {
+            if (is_string($key) && strpos($key, '.')) {
                 [$alias, $key] = explode('.', $key);
             }