mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-03 05:41:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进BelongsTo关联

Browse Source
This commit is contained in:
thinkphp
2017-03-28 11:56:01 +08:00
parent 8d843bec99
commit 62aa6a0f14
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Model.php
View File

@@ -1651,7 +1651,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$model = $this->parseModel($model);
$foreignKey = $foreignKey ?: $this->getForeignKey($model);
$localKey = $localKey ?: (new $model)->getPk();
return new BelongsTo($this, $model, $foreignKey, $localKey, $joinType);
$trace = debug_backtrace(false, 2);
$relation = Loader::parseName($trace[1]['function']);
return new BelongsTo($this, $model, $foreignKey, $localKey, $joinType, $relation);
}
/**