Skip to content

Commit 9bcb828

Browse files
committed
Revert #2051, fix #2058.
1 parent 4114813 commit 9bcb828

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/EloquentDataTable.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
140140
$table = '';
141141
$deletedAt = false;
142142
$lastQuery = $this->query;
143-
foreach (explode('.', $relation) as $index => $eachRelation) {
143+
foreach (explode('.', $relation) as $eachRelation) {
144144
$model = $lastQuery->getRelation($eachRelation);
145145
switch (true) {
146146
case $model instanceof BelongsToMany:
@@ -169,24 +169,19 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
169169

170170
case $model instanceof BelongsTo:
171171
$table = $model->getRelated()->getTable();
172-
$alias = "{$table}_{$index}";
173-
$tableAs = "{$table} AS {$alias}";
174172
$foreign = $model->getQualifiedForeignKeyName();
175-
$other = "{$alias}.{$model->getOwnerKeyName()}";
173+
$other = $model->getQualifiedOwnerKeyName();
176174
$deletedAt = $this->checkSoftDeletesOnModel($model->getRelated());
177-
178175
break;
179176

180177
default:
181178
throw new Exception('Relation ' . get_class($model) . ' is not yet supported.');
182179
}
183-
$this->performJoin($tableAs ?? $table, $foreign, $other, $deletedAt);
180+
$this->performJoin($table, $foreign, $other, $deletedAt);
184181
$lastQuery = $model->getQuery();
185182
}
186183

187-
$table = $alias ?? $table;
188-
189-
return "{$table}.{$relationColumn}";
184+
return $table . '.' . $relationColumn;
190185
}
191186

192187
protected function checkSoftDeletesOnModel($model)

0 commit comments

Comments
 (0)