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

改进

Browse Source
This commit is contained in:
thinkphp
2016-10-10 10:51:32 +08:00
parent f50140bbe2
commit 0b8327d135
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -667,10 +667,8 @@ class Query
if (is_array($join)) { if (is_array($join)) {
if (0 !== $key = key($join)) { if (0 !== $key = key($join)) {
// 设置了键名则键名为表名，键值作为表的别名 // 设置了键名则键名为表名，键值作为表的别名
$table = $key; $table = [$key => array_shift($join)];
$alias = array_shift($join); $this->alias($table);
$this->alias([$table => $alias]);
$table = [$table => $alias];
} else { } else {
$table = array_shift($join); $table = array_shift($join);
} }
@@ -678,8 +676,8 @@ class Query
$table = trim($join); $table = trim($join);
if (strpos($table, ' ')) { if (strpos($table, ' ')) {
list($table, $alias) = explode(' ', $table); list($table, $alias) = explode(' ', $table);
$this->alias([$table => $alias]);
$table = [$table => $alias]; $table = [$table => $alias];
$this->alias($table);
} }
} }
$this->options['join'][] = [$table, strtoupper($type), $condition]; $this->options['join'][] = [$table, strtoupper($type), $condition];