fix: prevent duplicate table name errors

Author: Seb33300

src/EloquentDataTable.php

@@ -164,7 +164,7 @@ protected function resolveRelationColumn(string $column): string
     {
         $parts = explode('.', $column);
         $columnName = array_pop($parts);
-        $relation = implode('.', $parts);
+        $relation = str_replace('[]', '', implode('.', $parts));
 
         if ($this->isNotEagerLoaded($relation)) {
             return $column;
@@ -184,64 +184,66 @@ protected function resolveRelationColumn(string $column): string
      */
     protected function joinEagerLoadedColumn($relation, $relationColumn)
     {
-        $table = '';
+        $table = $tableAlias = '';
         $lastQuery = $this->query;
         foreach (explode('.', $relation) as $eachRelation) {
             $model = $lastQuery->getRelation($eachRelation);
+            $lastAlias = $tableAlias ?: $model->getParent()->getTable();
+            $tableAlias = $tableAlias.'_'.$eachRelation;
+            $pivotAlias = $tableAlias.'_pivot';
             switch (true) {
                 case $model instanceof BelongsToMany:
                     $pivot = $model->getTable();
-                    $pivotPK = $model->getExistenceCompareKey();
-                    $pivotFK = $model->getQualifiedParentKeyName();
-                    $this->performJoin($pivot, $pivotPK, $pivotFK);
+                    $pivotPK = $pivotAlias.'.'.$model->getForeignPivotKeyName();
+                    $pivotFK = $lastAlias.'.'.$model->getParentKeyName();
+                    $this->performJoin($pivot.' as '.$pivotAlias, $pivotPK, $pivotFK);
 
                     $related = $model->getRelated();
                     $table = $related->getTable();
                     $tablePK = $model->getRelatedPivotKeyName();
-                    $foreign = $pivot.'.'.$tablePK;
-                    $other = $related->getQualifiedKeyName();
+                    $foreign = $pivotAlias.'.'.$tablePK;
+                    $other = $tableAlias.'.'.$related->getKeyName();
 
-                    $lastQuery->addSelect($table.'.'.$relationColumn);
-                    $this->performJoin($table, $foreign, $other);
+                    $lastQuery->addSelect($tableAlias.'.'.$relationColumn);
 
                     break;
 
                 case $model instanceof HasOneThrough:
                     $pivot = explode('.', $model->getQualifiedParentKeyName())[0]; // extract pivot table from key
-                    $pivotPK = $pivot.'.'.$model->getFirstKeyName();
-                    $pivotFK = $model->getQualifiedLocalKeyName();
-                    $this->performJoin($pivot, $pivotPK, $pivotFK);
+                    $pivotPK = $pivotAlias.'.'.$model->getFirstKeyName();
+                    $pivotFK = $lastAlias.'.'.$model->getLocalKeyName();
+                    $this->performJoin($pivot.' as '.$pivotAlias, $pivotPK, $pivotFK);
 
                     $related = $model->getRelated();
                     $table = $related->getTable();
                     $tablePK = $model->getSecondLocalKeyName();
-                    $foreign = $pivot.'.'.$tablePK;
-                    $other = $related->getQualifiedKeyName();
+                    $foreign = $pivotAlias.'.'.$tablePK;
+                    $other = $tableAlias.'.'.$related->getKeyName();
 
                     $lastQuery->addSelect($lastQuery->getModel()->getTable().'.*');
 
                     break;
 
                 case $model instanceof HasOneOrMany:
                     $table = $model->getRelated()->getTable();
-                    $foreign = $model->getQualifiedForeignKeyName();
-                    $other = $model->getQualifiedParentKeyName();
+                    $foreign = $lastAlias.'.'.$model->getForeignKeyName();
+                    $other = $tableAlias.'.'.$model->getLocalKeyName();
                     break;
 
                 case $model instanceof BelongsTo:
                     $table = $model->getRelated()->getTable();
-                    $foreign = $model->getQualifiedForeignKeyName();
-                    $other = $model->getQualifiedOwnerKeyName();
+                    $foreign = $lastAlias.'.'.$model->getForeignKeyName();
+                    $other = $tableAlias.'.'.$model->getOwnerKeyName();
                     break;
 
                 default:
                     throw new Exception('Relation '.$model::class.' is not yet supported.');
             }
-            $this->performJoin($table, $foreign, $other);
+            $this->performJoin($table.' as '.$tableAlias, $foreign, $other);
             $lastQuery = $model->getQuery();
         }
 
-        return $table.'.'.$relationColumn;
+        return $tableAlias.'.'.$relationColumn;
     }
 
     /**