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类的view方法 支持数据表定义别名

Browse Source
This commit is contained in:
thinkphp
2016-05-24 11:34:52 +08:00
parent 372959c7b1
commit 118800ed93
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -651,33 +651,39 @@ class Query
* @param string $type JOIN类型 * @param string $type JOIN类型
* @return $this * @return $this
*/ */
public function view($join, $field, $on = null, $type = 'INNER') public function view($join, $field = null, $on = null, $type = 'INNER')
{ {
$this->options['view'] = true; $this->options['view'] = true;
if (is_array($join)) { if (is_array($join) && is_null($field)) {
foreach ($join as $key => $val) { foreach ($join as $key => $val) {
$this->view($key, $val[0], isset($val[1]) ? $val[1] : null, isset($val[2]) ? $val[2] : 'INNER'); $this->view($key, $val[0], isset($val[1]) ? $val[1] : null, isset($val[2]) ? $val[2] : 'INNER');
} }
} else { } else {
$fields = []; $fields = [];
$table = $this->getTable($join); if (is_array($join)) {
// 支持数据表别名
list($join, $alias) = $join;
} else {
$alias = $join;
}
$table = $this->getTable($join);
if (is_string($field)) { if (is_string($field)) {
$field = explode(',', $field); $field = explode(',', $field);
} }
foreach ($field as $key => $val) { foreach ($field as $key => $val) {
if (is_numeric($key)) { if (is_numeric($key)) {
$fields[] = $join . '.' . $val; $fields[] = $alias . '.' . $val;
$this->options['map'][$val] = $join . '.' . $val; $this->options['map'][$val] = $alias . '.' . $val;
} else { } else {
$fields[] = $join . '.' . $key . ' AS ' . $val; $fields[] = $alias . '.' . $key . ' AS ' . $val;
$this->options['map'][$val] = $join . '.' . $key; $this->options['map'][$val] = $alias . '.' . $key;
} }
} }
$this->field($fields); $this->field($fields);
if ($on) { if ($on) {
$this->join($table . ' ' . $join, $on, $type); $this->join($table . ' ' . $alias, $on, $type);
} else { } else {
$this->table($table . ' ' . $join); $this->table($table . ' ' . $alias);
} }
} }
return $this; return $this;