From 0e5cfcdbc7bd11265dddcad9b6a71d34b4979cfb Mon Sep 17 00:00:00 2001 From: Mario Aguilar Alves Date: Wed, 21 Jun 2017 14:29:45 +0200 Subject: [PATCH] Bug fix when relation with forced foreign key --- src/SoftCascade.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SoftCascade.php b/src/SoftCascade.php index 4d40520..61bae98 100644 --- a/src/SoftCascade.php +++ b/src/SoftCascade.php @@ -59,7 +59,7 @@ protected function run($models) return; } - $this->relations($model, $model->getForeignKey(), $models->pluck($model->getKeyName())); + $this->relations($model, $models->pluck($model->getKeyName())); } return; } @@ -68,12 +68,11 @@ protected function run($models) * Iterate over the relations. * * @param Illuminate\Database\Eloquent\Model $model - * @param string $foreignKey * @param array $foreignKeyIds * * @return mixed */ - protected function relations($model, $foreignKey, $foreignKeyIds) + protected function relations($model, $foreignKeyIds) { $relations = $model->getSoftCascade(); @@ -85,7 +84,7 @@ protected function relations($model, $foreignKey, $foreignKeyIds) extract($this->relationResolver($relation)); $this->validateRelation($model, $relation); - $foreignKeyUse = $foreignKey; + $foreignKeyUse = $model->$relation()->getQualifiedForeignKeyName(); $foreignKeyIdsUse = $foreignKeyIds; //Many to many relations need to get related ids and related local key