Merge pull request #2072 from yajra/reverts

Revert #2051, fix #2058.
yajra · Apr 26, 2019 · d725ca0 · d725ca0
2 parents 4114813 + 9bcb828
commit d725ca0
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/EloquentDataTable.php b/src/EloquentDataTable.php
@@ -140,7 +140,7 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
         $table     = '';
         $deletedAt = false;
         $lastQuery = $this->query;
-        foreach (explode('.', $relation) as $index => $eachRelation) {
+        foreach (explode('.', $relation) as $eachRelation) {
             $model = $lastQuery->getRelation($eachRelation);
             switch (true) {
                 case $model instanceof BelongsToMany:
@@ -169,24 +169,19 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
 
                 case $model instanceof BelongsTo:
                     $table     = $model->getRelated()->getTable();
-                    $alias     = "{$table}_{$index}";
-                    $tableAs   = "{$table} AS {$alias}";
                     $foreign   = $model->getQualifiedForeignKeyName();
-                    $other     = "{$alias}.{$model->getOwnerKeyName()}";
+                    $other     = $model->getQualifiedOwnerKeyName();
                     $deletedAt = $this->checkSoftDeletesOnModel($model->getRelated());
-
                     break;
 
                 default:
                     throw new Exception('Relation ' . get_class($model) . ' is not yet supported.');
             }
-            $this->performJoin($tableAs ?? $table, $foreign, $other, $deletedAt);
+            $this->performJoin($table, $foreign, $other, $deletedAt);
             $lastQuery = $model->getQuery();
         }
 
-        $table = $alias ?? $table;
-
-        return "{$table}.{$relationColumn}";
+        return $table . '.' . $relationColumn;
     }
 
     protected function checkSoftDeletesOnModel($model)