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

规范预载入方法的调用 如果调用user_profile 预载入会自动对应 userProfile关联方法

Browse Source
This commit is contained in:
thinkphp
2016-12-11 17:36:35 +08:00
parent 63a3936eb9
commit c04bb1cd1e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Model.php
View File

@@ -1245,6 +1245,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (strpos($relation, '.')) { if (strpos($relation, '.')) {
list($relation, $subRelation) = explode('.', $relation); list($relation, $subRelation) = explode('.', $relation);
} }
$relation = Loader::parseName($relation, 1);
$this->$relation()->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $class); $this->$relation()->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $class);
} }
} }
@@ -1271,6 +1272,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (strpos($relation, '.')) { if (strpos($relation, '.')) {
list($relation, $subRelation) = explode('.', $relation); list($relation, $subRelation) = explode('.', $relation);
} }
$relation = Loader::parseName($relation, 1);
$this->$relation()->eagerlyResult($result, $relation, $subRelation, $closure, $class); $this->$relation()->eagerlyResult($result, $relation, $subRelation, $closure, $class);
} }
} }

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

@@ -1653,7 +1653,8 @@ class Query
} }
/** @var Relation $model */ /** @var Relation $model */
$model = $class->$relation(); $relation = Loader::parseName($relation, 1);
$model = $class->$relation();
if ($model instanceof HasOne || $model instanceof BelongsTo) { if ($model instanceof HasOne || $model instanceof BelongsTo) {
$model->eagerly($this, $relation, $subRelation, $closure, $first); $model->eagerly($this, $relation, $subRelation, $closure, $first);
$first = false; $first = false;