mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Query类的column方法

Browse Source
This commit is contained in:
thinkphp
2016-05-03 23:15:52 +08:00
parent 32c148ff2b
commit 027d4d5b88
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/db/Query.php
View File

@@ -131,8 +131,10 @@ class Query
$result = Cache::get($guid); $result = Cache::get($guid);
} }
if (!$result) { if (!$result) {
$key = ($key && '*' != $field) ? $key . ',' : ''; if ($key && '*' != $field) {
$pdo = $this->field($key . $field)->fetchPdo(true)->select(); $field = $key . ',' . $field;
}
$pdo = $this->field($field)->fetchPdo(true)->select();
if (1 == $pdo->columnCount()) { if (1 == $pdo->columnCount()) {
$result = $pdo->fetchAll(PDO::FETCH_COLUMN); $result = $pdo->fetchAll(PDO::FETCH_COLUMN);
} else { } else {
@@ -141,11 +143,12 @@ class Query
$count = count($fields); $count = count($fields);
$key1 = array_shift($fields); $key1 = array_shift($fields);
$key2 = $fields ? array_shift($fields) : ''; $key2 = $fields ? array_shift($fields) : '';
$key = $key ?: $key1;
foreach ($resultSet as $val) { foreach ($resultSet as $val) {
if ($count > 2) { if ($count > 2) {
$result[$val[$key1]] = $val; $result[$val[$key]] = $val;
} elseif (2 == $count) { } elseif (2 == $count) {
$result[$val[$key1]] = $val[$key2]; $result[$val[$key]] = $val[$key2];
} }
} }
} }