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

改进Query类的field方法

Browse Source
This commit is contained in:
thinkphp
2016-05-21 11:38:18 +08:00
parent 25981119ad
commit f3aceca2b0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/db/Builder.php
View File

@@ -85,7 +85,7 @@ abstract class Builder
if ('*' == $options['field']) { if ('*' == $options['field']) {
$fields = array_keys($bind); $fields = array_keys($bind);
} else { } else {
$fields = is_array($options['field']) ? $options['field'] : array_map('trim', explode(',', $options['field'])); $fields = $options['field'];
} }
$result = []; $result = [];
@@ -567,7 +567,7 @@ abstract class Builder
if ('*' == $options['field']) { if ('*' == $options['field']) {
$fields = $this->query->getTableInfo($options['table'], 'fields'); $fields = $this->query->getTableInfo($options['table'], 'fields');
} else { } else {
$fields = is_array($options['field']) ? $options['field'] : array_map('trim', explode(',', $options['field'])); $fields = $options['field'];
} }
foreach ($dataSet as &$data) { foreach ($dataSet as &$data) {

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

@@ -602,12 +602,12 @@ class Query
return $this; return $this;
} }
if (is_string($field)) { if (is_string($field)) {
$field = explode(',', $field); $field = array_map('trim', explode(',', $field));
} }
if (true === $field) { if (true === $field) {
// 获取全部字段 // 获取全部字段
$fields = $this->getTableInfo($tableName, 'fields'); $fields = $this->getTableInfo($tableName, 'fields');
$field = $fields ?: '*'; $field = $fields ?: ['*'];
} elseif ($except) { } elseif ($except) {
// 字段排除 // 字段排除
$fields = $this->getTableInfo($tableName, 'fields'); $fields = $this->getTableInfo($tableName, 'fields');