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

改进一对多的预载入 支持传入闭包条件

Browse Source
This commit is contained in:
thinkphp
2016-04-21 12:37:14 +08:00
parent f24bc5289c
commit 4602f135f6
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -890,6 +890,8 @@ class Query
call_user_func_array($closure, [ & $this]); call_user_func_array($closure, [ & $this]);
} }
$i++; $i++;
} elseif ($closure) {
$with[$key] = $closure;
} }
} }
$this->via(); $this->via();

22
library/think/model/Relation.php
View File

@@ -122,8 +122,13 @@ class Relation
{ {
$relations = is_string($relation) ? explode(',', $relation) : $relation; $relations = is_string($relation) ? explode(',', $relation) : $relation;
foreach ($relations as $relation) { foreach ($relations as $key => $relation) {
$subRelation = ''; $subRelation = '';
$closure = false;
if ($relation instanceof \Closure) {
$closure = $relation;
$relation = $key;
}
if (strpos($relation, '.')) { if (strpos($relation, '.')) {
list($relation, $subRelation) = explode('.', $relation); list($relation, $subRelation) = explode('.', $relation);
} }
@@ -150,7 +155,7 @@ class Relation
} }
if (!empty($range)) { if (!empty($range)) {
$data = $this->eagerlyOneToMany($this->model, [$foreignKey => ['in', $range]], $relation, $subRelation); $data = $this->eagerlyOneToMany($this->model, [$foreignKey => ['in', $range]], $relation, $subRelation, $closure);
// 关联数据封装 // 关联数据封装
foreach ($resultSet as $result) { foreach ($resultSet as $result) {
@@ -203,8 +208,13 @@ class Relation
{ {
$relations = is_string($relation) ? explode(',', $relation) : $relation; $relations = is_string($relation) ? explode(',', $relation) : $relation;
foreach ($relations as $relation) { foreach ($relations as $key => $relation) {
$subRelation = ''; $subRelation = '';
$closure = false;
if ($relation instanceof \Closure) {
$closure = $relation;
$relation = $key;
}
if (strpos($relation, '.')) { if (strpos($relation, '.')) {
list($relation, $subRelation) = explode('.', $relation); list($relation, $subRelation) = explode('.', $relation);
} }
@@ -220,7 +230,7 @@ class Relation
break; break;
case self::HAS_MANY: case self::HAS_MANY:
if (isset($result->$localKey)) { if (isset($result->$localKey)) {
$data = $this->eagerlyOneToMany($model, [$foreignKey => $result->$localKey], $relation, $subRelation); $data = $this->eagerlyOneToMany($model, [$foreignKey => $result->$localKey], $relation, $subRelation, $closure);
// 关联数据封装 // 关联数据封装
if (!isset($data[$result->$localKey])) { if (!isset($data[$result->$localKey])) {
$data[$result->$localKey] = []; $data[$result->$localKey] = [];
@@ -286,11 +296,11 @@ class Relation
* @param string $subRelation 子关联 * @param string $subRelation 子关联
* @return void * @return void
*/ */
protected function eagerlyOneToMany($model, $where, $relation, $subRelation = '') protected function eagerlyOneToMany($model, $where, $relation, $subRelation = '', $closure = false)
{ {
$foreignKey = $this->foreignKey; $foreignKey = $this->foreignKey;
// 预载入关联查询 支持嵌套预载入 // 预载入关联查询 支持嵌套预载入
$list = $model->where($where)->with($subRelation)->select(); $list = $model->where($where)->where($closure)->with($subRelation)->select();
// 组装模型数据 // 组装模型数据
$data = []; $data = [];