Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

解决列表外键全部为null时，预加载查询变成懒加载查询的问题 #2652

Open
wants to merge 1 commit into
base: 5.1
Choose a base branch
from
Open

解决列表外键全部为null时，预加载查询变成懒加载查询的问题 #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 23 additions & 22 deletions library/think/model/relation/BelongsTo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,34 +207,35 @@ protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure)
}
}

$data = [];
if (!empty($range)) {
$this->query->removeWhereField($localKey);

$data = $this->eagerlyWhere([
[$localKey, 'in', $range],
], $localKey, $relation, $subRelation, $closure);
}

// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
// 关联模型
if (!isset($data[$result->$foreignKey])) {
$relationModel = null;
} else {
$relationModel = $data[$result->$foreignKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
// 关联模型
if (!isset($data[$result->$foreignKey])) {
$relationModel = null;
} else {
$relationModel = $data[$result->$foreignKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result);
} else {
// 设置关联属性
$result->setRelation($attr, $relationModel);
}
if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result);
} else {
// 设置关联属性
$result->setRelation($attr, $relationModel);
}
}
}
Expand Down
19 changes: 10 additions & 9 deletions library/think/model/relation/BelongsToMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,23 +310,24 @@ public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
}
}

$data = [];
if (!empty($range)) {
// 查询关联数据
$data = $this->eagerlyManyToMany([
['pivot.' . $localKey, 'in', $range],
], $relation, $subRelation, $closure);
}

// 关联属性名
$attr = Loader::parseName($relation);
// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$data[$result->$pk] = [];
}

$result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$data[$result->$pk] = [];
}

$result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
}
}

Expand Down
27 changes: 14 additions & 13 deletions library/think/model/relation/HasMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,28 +88,29 @@ public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
}
}

$data = [];
if (!empty($range)) {
$where = [
[$this->foreignKey, 'in', $range],
];
$data = $this->eagerlyOneToMany($where, $relation, $subRelation, $closure);
}

// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
$pk = $result->$localKey;
if (!isset($data[$pk])) {
$data[$pk] = [];
}
// 关联属性名
$attr = Loader::parseName($relation);

foreach ($data[$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
}
// 关联数据封装
foreach ($resultSet as $result) {
$pk = $result->$localKey;
if (!isset($data[$pk])) {
$data[$pk] = [];
}

$result->setRelation($attr, $this->resultSetBuild($data[$pk]));
foreach ($data[$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
}

$result->setRelation($attr, $this->resultSetBuild($data[$pk]));
}
}

Expand Down
29 changes: 15 additions & 14 deletions library/think/model/relation/HasManyThrough.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,30 +161,31 @@ public function eagerlyResultSet(array &$resultSet, $relation, $subRelation = ''
}
}

$data = [];
if (!empty($range)) {
$this->query->removeWhereField($foreignKey);

$data = $this->eagerlyWhere([
[$this->foreignKey, 'in', $range],
], $foreignKey, $relation, $subRelation, $closure);
}

// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
$pk = $result->$localKey;
if (!isset($data[$pk])) {
$data[$pk] = [];
}
// 关联属性名
$attr = Loader::parseName($relation);

foreach ($data[$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
}
// 关联数据封装
foreach ($resultSet as $result) {
$pk = $result->$localKey;
if (!isset($data[$pk])) {
$data[$pk] = [];
}

// 设置关联属性
$result->setRelation($attr, $this->resultSetBuild($data[$pk]));
foreach ($data[$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
}

// 设置关联属性
$result->setRelation($attr, $this->resultSetBuild($data[$pk]));
}
}

Expand Down
43 changes: 22 additions & 21 deletions library/think/model/relation/HasOne.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,34 +206,35 @@ protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure)
}
}

$data = [];
if (!empty($range)) {
$this->query->removeWhereField($foreignKey);

$data = $this->eagerlyWhere([
[$foreignKey, 'in', $range],
], $foreignKey, $relation, $subRelation, $closure);
}

// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
// 关联模型
if (!isset($data[$result->$localKey])) {
$relationModel = null;
} else {
$relationModel = $data[$result->$localKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
} else {
// 设置关联属性
$result->setRelation($attr, $relationModel);
}
// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
// 关联模型
if (!isset($data[$result->$localKey])) {
$relationModel = null;
} else {
$relationModel = $data[$result->$localKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
} else {
// 设置关联属性
$result->setRelation($attr, $relationModel);
}
}
}
Expand Down
27 changes: 14 additions & 13 deletions library/think/model/relation/MorphMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,29 +120,30 @@ public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
}
}

$data = [];
if (!empty($range)) {
$where = [
[$morphKey, 'in', $range],
[$morphType, '=', $type],
];
$data = $this->eagerlyMorphToMany($where, $relation, $subRelation, $closure);
}

// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$data[$result->$pk] = [];
}
// 关联属性名
$attr = Loader::parseName($relation);

foreach ($data[$result->$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}
// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$data[$result->$pk] = [];
}

$result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
foreach ($data[$result->$pk] as &$relationModel) {
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

$result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
}
}

Expand Down
27 changes: 14 additions & 13 deletions library/think/model/relation/MorphOne.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,27 +119,28 @@ public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
}
}

$data = [];
if (!empty($range)) {
$data = $this->eagerlyMorphToOne([
[$morphKey, 'in', $range],
[$morphType, '=', $type],
], $relation, $subRelation, $closure);
}

// 关联属性名
$attr = Loader::parseName($relation);

// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$relationModel = null;
} else {
$relationModel = $data[$result->$pk];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}
// 关联属性名
$attr = Loader::parseName($relation);

$result->setRelation($attr, $relationModel);
// 关联数据封装
foreach ($resultSet as $result) {
if (!isset($data[$result->$pk])) {
$relationModel = null;
} else {
$relationModel = $data[$result->$pk];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

$result->setRelation($attr, $relationModel);
}
}

Expand Down
38 changes: 19 additions & 19 deletions library/think/model/relation/MorphTo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,8 @@ public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
}
}

$data = [];
if (!empty($range)) {
// 关联属性名
$attr = Loader::parseName($relation);

foreach ($range as $key => $val) {
// 多态类型映射
$model = $this->parseModel($key);
Expand All @@ -197,27 +195,29 @@ public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
}
}
$list = $obj->all($val, $subRelation);
$data = [];

foreach ($list as $k => $vo) {
$data[$vo->$pk] = $vo;
$uniqKey = $vo->$pk. '@'. $key;
$data[$uniqKey] = $vo;
}
}
}

foreach ($resultSet as $result) {
if ($key == $result->$morphType) {
// 关联模型
if (!isset($data[$result->$morphKey])) {
$relationModel = null;
} else {
$relationModel = $data[$result->$morphKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

$result->setRelation($attr, $relationModel);
}
}
// 关联属性名
$attr = Loader::parseName($relation);

foreach ($resultSet as $result) {
// 关联模型
$uniqKey = $result->$morphKey. '@'. $result->$morphType;
if (!isset($data[$uniqKey])) {
$relationModel = null;
} else {
$relationModel = $data[$uniqKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}

$result->setRelation($attr, $relationModel);
}
}

Expand Down