mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 13:31:38 +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

15
library/think/model/relation/HasMany.php
View File

@@ -13,7 +13,6 @@ namespace think\model\relation;
use think\Db;
use think\db\Query;
use think\Loader;
use think\Model;
use think\model\Relation;
@@ -55,10 +54,9 @@ class HasMany extends Relation
* @param string $subRelation 子关联名
* @param \Closure $closure 闭包
* @param string $class 数据集对象名 为空表示数组
* @param bool $count 是否统计
* @return void
*/
public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class, $count)
public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
{
$localKey = $this->localKey;
$foreignKey = $this->foreignKey;
@@ -85,10 +83,6 @@ class HasMany extends Relation
if (!isset($data[$result->$localKey])) {
$data[$result->$localKey] = [];
}
if ($count) {
// 关联统计
$result->setAttr(Loader::parseName($relation) . '_count', count($data[$result->$localKey]));
}
$result->setAttr($relation, $this->resultSetBuild($data[$result->$localKey], $class));
}
}
@@ -102,10 +96,9 @@ class HasMany extends Relation
* @param string $subRelation 子关联名
* @param \Closure $closure 闭包
* @param string $class 数据集对象名 为空表示数组
* @param bool $count 是否统计
* @return void
*/
public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class, $count)
public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
{
$localKey = $this->localKey;
$foreignKey = $this->foreignKey;
@@ -116,10 +109,6 @@ class HasMany extends Relation
if (!isset($data[$result->$localKey])) {
$data[$result->$localKey] = [];
}
if ($count) {
// 关联统计
$result->setAttr(Loader::parseName($relation) . '_count', count($data[$result->$localKey]));
}
$result->setAttr($relation, $this->resultSetBuild($data[$result->$localKey], $class));
}
}