From 0944d0fe0e9f42260be4021cb3f3ef7a447601d3 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Sat, 21 Jan 2017 17:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=BD=BD=E5=85=A5=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E9=BB=98=E8=AE=A4=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/model/relation/BelongsTo.php | 5 +++-- library/think/model/relation/BelongsToMany.php | 3 ++- library/think/model/relation/HasMany.php | 5 +++-- library/think/model/relation/HasOne.php | 5 +++-- library/think/model/relation/MorphMany.php | 5 +++-- library/think/model/relation/MorphTo.php | 4 ++-- library/think/model/relation/OneToOne.php | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/library/think/model/relation/BelongsTo.php b/library/think/model/relation/BelongsTo.php index 319e62fb..8bf4cc4a 100644 --- a/library/think/model/relation/BelongsTo.php +++ b/library/think/model/relation/BelongsTo.php @@ -11,6 +11,7 @@ namespace think\model\relation; +use think\Loader; use think\Model; class BelongsTo extends OneToOne @@ -92,7 +93,7 @@ class BelongsTo extends OneToOne $this->bindAttr($relationModel, $result, $this->bindAttr); } // 设置关联属性 - $result->setAttr($relation, $relationModel); + $result->setAttr(Loader::parseName($relation), $relationModel); } } } @@ -122,7 +123,7 @@ class BelongsTo extends OneToOne $this->bindAttr($relationModel, $result, $this->bindAttr); } // 设置关联属性 - $result->setAttr($relation, $relationModel); + $result->setAttr(Loader::parseName($relation), $relationModel); } } diff --git a/library/think/model/relation/BelongsToMany.php b/library/think/model/relation/BelongsToMany.php index 2d6c353f..fba77a31 100644 --- a/library/think/model/relation/BelongsToMany.php +++ b/library/think/model/relation/BelongsToMany.php @@ -14,6 +14,7 @@ namespace think\model\relation; use think\Db; use think\db\Query; use think\Exception; +use think\Loader; use think\Model; use think\model\Pivot; use think\model\Relation; @@ -115,7 +116,7 @@ class BelongsToMany extends Relation $data[$result->$pk] = []; } - $result->setAttr($relation, $this->resultSetBuild($data[$result->$pk], $class)); + $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk], $class)); } } } diff --git a/library/think/model/relation/HasMany.php b/library/think/model/relation/HasMany.php index 2ddf370f..0b145f77 100644 --- a/library/think/model/relation/HasMany.php +++ b/library/think/model/relation/HasMany.php @@ -13,6 +13,7 @@ namespace think\model\relation; use think\Db; use think\db\Query; +use think\Loader; use think\Model; use think\model\Relation; @@ -84,7 +85,7 @@ class HasMany extends Relation if (!isset($data[$result->$localKey])) { $data[$result->$localKey] = []; } - $result->setAttr($relation, $this->resultSetBuild($data[$result->$localKey], $class)); + $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey], $class)); } } } @@ -109,7 +110,7 @@ class HasMany extends Relation if (!isset($data[$result->$localKey])) { $data[$result->$localKey] = []; } - $result->setAttr($relation, $this->resultSetBuild($data[$result->$localKey], $class)); + $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey], $class)); } } diff --git a/library/think/model/relation/HasOne.php b/library/think/model/relation/HasOne.php index b1fa25f0..23ffecd2 100644 --- a/library/think/model/relation/HasOne.php +++ b/library/think/model/relation/HasOne.php @@ -11,6 +11,7 @@ namespace think\model\relation; +use think\Loader; use think\Model; class HasOne extends OneToOne @@ -119,7 +120,7 @@ class HasOne extends OneToOne $this->bindAttr($relationModel, $result, $this->bindAttr); } // 设置关联属性 - $result->setAttr($relation, $relationModel); + $result->setAttr(Loader::parseName($relation), $relationModel); } } } @@ -148,7 +149,7 @@ class HasOne extends OneToOne // 绑定关联属性 $this->bindAttr($relationModel, $result, $this->bindAttr); } - $result->setAttr($relation, $relationModel); + $result->setAttr(Loader::parseName($relation), $relationModel); } } diff --git a/library/think/model/relation/MorphMany.php b/library/think/model/relation/MorphMany.php index 68eb0834..82b429ff 100644 --- a/library/think/model/relation/MorphMany.php +++ b/library/think/model/relation/MorphMany.php @@ -13,6 +13,7 @@ namespace think\model\relation; use think\Db; use think\db\Query; +use think\Loader; use think\Model; use think\model\Relation; @@ -94,7 +95,7 @@ class MorphMany extends Relation if (!isset($data[$result->$pk])) { $data[$result->$pk] = []; } - $result->setAttr($relation, $this->resultSetBuild($data[$result->$pk], $class)); + $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk], $class)); } } } @@ -114,7 +115,7 @@ class MorphMany extends Relation $pk = $result->getPk(); if (isset($result->$pk)) { $data = $this->eagerlyMorphToMany([$this->morphKey => $result->$pk, $this->morphType => $this->type], $relation, $subRelation, $closure); - $result->setAttr($relation, $this->resultSetBuild($data[$result->$pk], $class)); + $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk], $class)); } } diff --git a/library/think/model/relation/MorphTo.php b/library/think/model/relation/MorphTo.php index a4672233..d6a7a933 100644 --- a/library/think/model/relation/MorphTo.php +++ b/library/think/model/relation/MorphTo.php @@ -126,7 +126,7 @@ class MorphTo extends Relation if (!isset($data[$result->$morphKey])) { $data[$result->$morphKey] = []; } - $result->setAttr($relation, $this->resultSetBuild($data[$result->$morphKey], $class)); + $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$morphKey], $class)); } } } @@ -179,7 +179,7 @@ class MorphTo extends Relation if ($data) { $data->isUpdate(true); } - $result->setAttr($relation, $data ?: null); + $result->setAttr(Loader::parseName($relation), $data ?: null); } /** diff --git a/library/think/model/relation/OneToOne.php b/library/think/model/relation/OneToOne.php index c07cce05..fd11733d 100644 --- a/library/think/model/relation/OneToOne.php +++ b/library/think/model/relation/OneToOne.php @@ -228,7 +228,7 @@ abstract class OneToOne extends Relation $this->bindAttr($relationModel, $result, $this->bindAttr); } } - $result->setAttr($relation, !isset($relationModel) ? null : $relationModel->isUpdate(true)); + $result->setAttr(Loader::parseName($relation), !isset($relationModel) ? null : $relationModel->isUpdate(true)); } /**