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

改进Query类的join方法

Browse Source
This commit is contained in:
thinkphp
2016-10-21 23:18:29 +08:00
parent a83af51903
commit 2c15118f60
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,14 +670,17 @@ class Query
}
} else {
$prefix = $this->prefix;
$table = trim($join);
if ($prefix && false === strpos($table, '(') && false === strpos($table, '.') && 0 !== strpos($table, $prefix) && 0 !== strpos($table, '__')) {
$table = $this->getTable($table);
}
if (strpos($table, ' ') && !strpos($table, ')')) {
list($table, $alias) = explode(' ', $table);
$join = trim($join);
if ($prefix && false === strpos($join, '(') && false === strpos($join, '.') && 0 !== strpos($join, $prefix) && 0 !== strpos($join, '__')) {
$table = $this->getTable($join);
$table = [$table => $join];
$this->alias($table);
} elseif (strpos($join, ' ') && !strpos($join, ')')) {
list($table, $alias) = explode(' ', $join);
$table = [$table => $alias];
$this->alias($table);
} else {
$table = $join;
}
}
$this->options['join'][] = [$table, strtoupper($type), $condition];