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

Revert "关联预载入查询支持关联统计"

Browse Source 
This reverts commit 9657ee01b1.
This commit is contained in:
thinkphp
2016-12-22 13:30:43 +08:00
parent 9657ee01b1
commit bde2607442
5 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Model.php
View File

@@ -1261,10 +1261,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param array $resultSet 数据集
* @param string $relation 关联名
* @param string $class 数据集对象名 为空表示数组
* @param bool $count 是否统计
* @return array
*/
public function eagerlyResultSet(&$resultSet, $relation, $class = '', $count = false)
public function eagerlyResultSet(&$resultSet, $relation, $class = '')
{
$relations = is_string($relation) ? explode(',', $relation) : $relation;
foreach ($relations as $key => $relation) {
@@ -1278,7 +1277,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
list($relation, $subRelation) = explode('.', $relation);
}
$relation = Loader::parseName($relation, 1, false);
$this->$relation()->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $class, $count);
$this->$relation()->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $class);
}
}
@@ -1288,10 +1287,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param Model $result 数据对象
* @param string $relation 关联名
* @param string $class 数据集对象名 为空表示数组
* @param bool $count 是否统计
* @return Model
*/
public function eagerlyResult(&$result, $relation, $class = '', $count = false)
public function eagerlyResult(&$result, $relation, $class = '')
{
$relations = is_string($relation) ? explode(',', $relation) : $relation;
@@ -1306,7 +1304,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
list($relation, $subRelation) = explode('.', $relation);
}
$relation = Loader::parseName($relation, 1, false);
$this->$relation()->eagerlyResult($result, $relation, $subRelation, $closure, $class, $count);
$this->$relation()->eagerlyResult($result, $relation, $subRelation, $closure, $class);
}
}