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

关联定义支持数据表别名定义

Browse Source
This commit is contained in:
thinkphp
2016-05-24 12:29:51 +08:00
parent 38f343f69f
commit 165c72e0aa
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1294,13 +1294,15 @@ class Query
if (0 == $i) {
$name = Loader::parseName(basename(str_replace('\\', '/', $currentModel)));
$table = $this->getTable();
$this->table($table)->alias($name)->field(true, false, $table, $name);
$alias = isset($info['alias'][$name]) ? $info['alias'][$name] : $name;
$this->table($table)->alias($alias)->field(true, false, $table, $alias);
}
// 预载入封装
$joinTable = $model->getTable();
$joinName = Loader::parseName(basename(str_replace('\\', '/', $info['model'])));
$this->via($joinName);
$this->join($joinTable . ' ' . $joinName, $name . '.' . $info['localKey'] . '=' . $joinName . '.' . $info['foreignKey'])->field(true, false, $joinTable, $joinName, $joinName . '__');
$joinAlias = isset($info['alias'][$joinName]) ? $info['alias'][$joinName] : $joinName;
$this->via($joinAlias);
$this->join($joinTable . ' ' . $joinAlias, $alias . '.' . $info['localKey'] . '=' . $joinAlias . '.' . $info['foreignKey'])->field(true, false, $joinTable, $joinAlias, $joinName . '__');
if ($closure) {
// 执行闭包查询
call_user_func_array($closure, [ & $this]);