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

Model类增加setRelation方法和setAttr方法区分

Browse Source
This commit is contained in:
thinkphp
2017-04-27 12:16:43 +08:00
parent 80e1b52615
commit 9bb01ec145
9 changed files with 36 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/model/relation/BelongsTo.php
View File

@@ -148,7 +148,7 @@ class BelongsTo extends OneToOne
$this->bindAttr($relationModel, $result, $this->bindAttr);
}
// 设置关联属性
$result->setAttr($attr, $relationModel);
$result->setRelation($attr, $relationModel);
}
}
}
@@ -180,7 +180,7 @@ class BelongsTo extends OneToOne
$this->bindAttr($relationModel, $result, $this->bindAttr);
}
// 设置关联属性
$result->setAttr(Loader::parseName($relation), $relationModel);
$result->setRelation(Loader::parseName($relation), $relationModel);
}
/**
@@ -197,7 +197,7 @@ class BelongsTo extends OneToOne
$this->parent->setAttr($foreignKey, $model->$pk);
$this->parent->save();
return $this->parent->setAttr($this->relation, $model);
return $this->parent->setRelation($this->relation, $model);
}
/**
@@ -212,6 +212,6 @@ class BelongsTo extends OneToOne
$this->parent->setAttr($foreignKey, null);
$this->parent->save();
return $this->parent->setAttr($this->relation, null);
return $this->parent->setRelation($this->relation, null);
}
}

4
library/think/model/relation/BelongsToMany.php
View File

@@ -267,7 +267,7 @@ class BelongsToMany extends Relation
$data[$result->$pk] = [];
}
$result->setAttr($attr, $this->resultSetBuild($data[$result->$pk]));
$result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
}
}
}
@@ -293,7 +293,7 @@ class BelongsToMany extends Relation
if (!isset($data[$pk])) {
$data[$pk] = [];
}
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$pk]));
$result->setRelation(Loader::parseName($relation), $this->resultSetBuild($data[$pk]));
}
}

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

@@ -95,7 +95,7 @@ class HasMany extends Relation
$relationModel->setParent(clone $result);
}
$result->setAttr($attr, $this->resultSetBuild($data[$result->$localKey]));
$result->setRelation($attr, $this->resultSetBuild($data[$result->$localKey]));
}
}
}
@@ -124,7 +124,7 @@ class HasMany extends Relation
$relationModel->setParent(clone $result);
}
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey]));
$result->setRelation(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey]));
}
}

4
library/think/model/relation/HasOne.php
View File

@@ -146,7 +146,7 @@ class HasOne extends OneToOne
}
}
// 设置关联属性
$result->setAttr($attr, $relationModel);
$result->setRelation($attr, $relationModel);
}
}
}
@@ -179,7 +179,7 @@ class HasOne extends OneToOne
}
}
$result->setAttr(Loader::parseName($relation), $relationModel);
$result->setRelation(Loader::parseName($relation), $relationModel);
}
}

4
library/think/model/relation/MorphMany.php
View File

@@ -129,7 +129,7 @@ class MorphMany extends Relation
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}
$result->setAttr($attr, $this->resultSetBuild($data[$result->$pk]));
$result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
}
}
}
@@ -161,7 +161,7 @@ class MorphMany extends Relation
$relationModel->isUpdate(true);
}
$result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk]));
$result->setRelation(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk]));
}
}

4
library/think/model/relation/MorphOne.php
View File

@@ -129,7 +129,7 @@ class MorphOne extends Relation
$relationModel->isUpdate(true);
}
$result->setAttr($attr, $relationModel);
$result->setRelation($attr, $relationModel);
}
}
}
@@ -161,7 +161,7 @@ class MorphOne extends Relation
$relationModel = null;
}
$result->setAttr(Loader::parseName($relation), $relationModel);
$result->setRelation(Loader::parseName($relation), $relationModel);
}
}

11
library/think/model/relation/MorphTo.php
View File

@@ -177,7 +177,7 @@ class MorphTo extends Relation
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
$result->setAttr($attr, $relationModel);
$result->setRelation($attr, $relationModel);
}
}
}
@@ -232,7 +232,7 @@ class MorphTo extends Relation
$data->setParent(clone $result);
$data->isUpdate(true);
}
$result->setAttr(Loader::parseName($relation), $data ?: null);
$result->setRelation(Loader::parseName($relation), $data ?: null);
}
/**
@@ -251,7 +251,7 @@ class MorphTo extends Relation
$this->parent->setAttr($morphType, get_class($model));
$this->parent->save();
return $this->parent->setAttr($this->relation, $model);
return $this->parent->setRelation($this->relation, $model);
}
/**
@@ -268,7 +268,7 @@ class MorphTo extends Relation
$this->parent->setAttr($morphType, null);
$this->parent->save();
return $this->parent->setAttr($this->relation, null);
return $this->parent->setRelation($this->relation, null);
}
/**
@@ -277,6 +277,5 @@ class MorphTo extends Relation
* @return void
*/
protected function baseQuery()
{
}
{}
}

5
library/think/model/relation/OneToOne.php
View File

@@ -257,7 +257,7 @@ abstract class OneToOne extends Relation
} else {
$relationModel = null;
}
$result->setAttr(Loader::parseName($relation), $relationModel);
$result->setRelation(Loader::parseName($relation), $relationModel);
}
/**
@@ -317,6 +317,5 @@ abstract class OneToOne extends Relation
* @return void
*/
protected function baseQuery()
{
}
{}
}