恢复关联定义参数

Author: liu21st

src/model/concern/RelationShip.php

@@ -544,32 +544,35 @@ public function relationCount(Query $query, array $relations, string $aggregate
      *
      * @param string $model      模型名
      * @param string $foreignKey 关联外键
+     * @param string $localKey   当前主键
      *
      * @return HasOne
      */
-    public function hasOne(string $model, string $foreignKey = ''): HasOne
+    public function hasOne(string $model, string $foreignKey = '', string $localKey = ''): HasOne
     {
         // 记录当前关联信息
         $model      = $this->parseRelationModel($model);
+        $localKey   = $localKey ?: $this->getPk();
         $foreignKey = $foreignKey ?: $this->getForeignKey($this->getName());
 
-        return new HasOne($this, $model, $foreignKey, $this->getPk());
+        return new HasOne($this, $model, $foreignKey, $localKey);
     }
 
     /**
      * BELONGS TO 关联定义.
      *
      * @param string $model      模型名
      * @param string $foreignKey 关联外键
+     * @param string $localKey   关联主键
      *
      * @return BelongsTo
      */
-    public function belongsTo(string $model, string $foreignKey = ''): BelongsTo
+    public function belongsTo(string $model, string $foreignKey = '', string $localKey = ''): BelongsTo
     {
         // 记录当前关联信息
         $model      = $this->parseRelationModel($model);
         $foreignKey = $foreignKey ?: $this->getForeignKey((new $model())->getName());
-        $localKey   = (new $model())->getPk();
+        $localKey   = $localKey ?: (new $model())->getPk();
         $trace      = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
         $relation   = Str::snake($trace[1]['function']);
 
@@ -581,16 +584,18 @@ public function belongsTo(string $model, string $foreignKey = ''): BelongsTo
      *
      * @param string $model      模型名
      * @param string $foreignKey 关联外键
+     * @param string $localKey   当前主键
      *
      * @return HasMany
      */
-    public function hasMany(string $model, string $foreignKey = ''): HasMany
+    public function hasMany(string $model, string $foreignKey = '', string $localKey = ''): HasMany
     {
         // 记录当前关联信息
         $model      = $this->parseRelationModel($model);
+        $localKey   = $localKey ?: $this->getPk();
         $foreignKey = $foreignKey ?: $this->getForeignKey($this->getName());
 
-        return new HasMany($this, $model, $foreignKey, $this->getPk());
+        return new HasMany($this, $model, $foreignKey, $localKey);
     }
 
     /**
@@ -600,6 +605,8 @@ public function hasMany(string $model, string $foreignKey = ''): HasMany
      * @param string $through    中间模型名
      * @param string $foreignKey 关联外键
      * @param string $throughKey 关联外键
+     * @param string $localKey   当前主键
+     * @param string $throughPk  中间表主键
      *
      * @return HasManyThrough
      */
@@ -608,10 +615,10 @@ public function hasManyThrough(string $model, string $through, string $foreignKe
         // 记录当前关联信息
         $model      = $this->parseRelationModel($model);
         $through    = $this->parseRelationModel($through);
+        $localKey   = $localKey ?: $this->getPk();
         $foreignKey = $foreignKey ?: $this->getForeignKey($this->getName());
         $throughKey = $throughKey ?: $this->getForeignKey((new $through())->getName());
-        $localKey   = $this->getPk();
-        $throughPk  = (new $through())->getPk();
+        $throughPk  = $throughPk ?: (new $through())->getPk();
 
         return new HasManyThrough($this, $model, $through, $foreignKey, $throughKey, $localKey, $throughPk);
     }
@@ -623,18 +630,20 @@ public function hasManyThrough(string $model, string $through, string $foreignKe
      * @param string $through    中间模型名
      * @param string $foreignKey 关联外键
      * @param string $throughKey 关联外键
+     * @param string $localKey   当前主键
+     * @param string $throughPk  中间表主键
      *
      * @return HasOneThrough
      */
-    public function hasOneThrough(string $model, string $through, string $foreignKey = '', string $throughKey = ''): HasOneThrough
+    public function hasOneThrough(string $model, string $through, string $foreignKey = '', string $throughKey = '', string $localKey = '', string $throughPk = ''): HasOneThrough
     {
         // 记录当前关联信息
         $model      = $this->parseRelationModel($model);
         $through    = $this->parseRelationModel($through);
+        $localKey   = $localKey ?: $this->getPk();
         $foreignKey = $foreignKey ?: $this->getForeignKey($this->getName());
         $throughKey = $throughKey ?: $this->getForeignKey((new $through())->getName());
-        $localKey   = $this->getPk();
-        $throughPk  = (new $through())->getPk();
+        $throughPk  = $throughPk ?: (new $through())->getPk();
 
         return new HasOneThrough($this, $model, $through, $foreignKey, $throughKey, $localKey, $throughPk);
     }