From c947a4dd379605b7a2557f7b55e49ab2081ccbff Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 26 Dec 2019 09:58:57 -0800 Subject: [PATCH 1/2] Add support for Nova usage --- src/Relations/BelongsToThrough.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Relations/BelongsToThrough.php b/src/Relations/BelongsToThrough.php index 13978fc..d06df5d 100644 --- a/src/Relations/BelongsToThrough.php +++ b/src/Relations/BelongsToThrough.php @@ -109,9 +109,9 @@ protected function performJoins(Builder $query = null) * @param \Illuminate\Database\Eloquent\Model $model * @return string */ - protected function getForeignKeyName(Model $model) + public function getForeignKeyName(Model $model = null) { - $table = explode(' as ', $model->getTable())[0]; + $table = ($model ?? $this->parent)->getTable(); if (array_key_exists($table, $this->foreignKeyLookup)) { return $this->foreignKeyLookup[$table]; From f973e35a33f53140f52c5ae99539722cf40a844d Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 26 Dec 2019 10:07:19 -0800 Subject: [PATCH 2/2] Add support for Nova usage --- src/Relations/BelongsToThrough.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Relations/BelongsToThrough.php b/src/Relations/BelongsToThrough.php index d06df5d..1d1af86 100644 --- a/src/Relations/BelongsToThrough.php +++ b/src/Relations/BelongsToThrough.php @@ -111,7 +111,7 @@ protected function performJoins(Builder $query = null) */ public function getForeignKeyName(Model $model = null) { - $table = ($model ?? $this->parent)->getTable(); + $table = explode(' as ', ($model ?? $this->parent)->getTable())[0]; if (array_key_exists($table, $this->foreignKeyLookup)) { return $this->foreignKeyLookup[$table];