Skip to content

Commit 0f77680

Browse files
authored
fix HasOneThrough
1 parent ae5b926 commit 0f77680

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/EloquentDataTable.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
189189

190190
case $model instanceof HasOneThrough:
191191
$pivot = explode('.', $model->getQualifiedParentKeyName())[0]; // extract pivot table from key
192-
$pivotPK = $pivot . '.' . $model->getLocalKeyName();
192+
$pivotPK = $pivot . '.' . $model->getFirstKeyName();
193193
$pivotFK = $model->getQualifiedLocalKeyName();
194194
$this->performJoin($pivot, $pivotPK, $pivotFK);
195195

@@ -199,6 +199,8 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
199199
$foreign = $pivot . '.' . $tablePK;
200200
$other = $related->getQualifiedKeyName();
201201

202+
$lastQuery->addSelect($lastQuery->getModel()->getTable().'.*');
203+
202204
break;
203205

204206
case $model instanceof HasOneOrMany:

0 commit comments

Comments
 (0)