diff --git a/src/EloquentBuilderTrait.php b/src/EloquentBuilderTrait.php index c54e631..067e527 100644 --- a/src/EloquentBuilderTrait.php +++ b/src/EloquentBuilderTrait.php @@ -267,7 +267,7 @@ private function hasCustomMethod($type, $key) * @param Builder $queryBuilder * @param $key */ - private function joinRelatedModelIfExists(Builder $queryBuilder, $key) + protected function joinRelatedModelIfExists(Builder $queryBuilder, $key) { $model = $queryBuilder->getModel(); @@ -279,9 +279,9 @@ private function joinRelatedModelIfExists(Builder $queryBuilder, $key) if ($relation instanceof BelongsTo) { $queryBuilder->join( $relation->getRelated()->getTable(), - $model->getTable().'.'.$relation->getQualifiedForeignKeyName(), + $relation->getQualifiedForeignKey(), '=', - $relation->getRelated()->getTable().'.'.$relation->getOwnerKey(), + $relation->getQualifiedOwnerKeyName(), $type ); } elseif ($relation instanceof BelongsToMany) {