Merge pull request #2051 from Morinohtar/9.0

[9.0] Sorting nested relation that refers to the same table.

Author: yajra

src/EloquentDataTable.php

@@ -140,7 +140,7 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
         $table     = '';
         $deletedAt = false;
         $lastQuery = $this->query;
-        foreach (explode('.', $relation) as $eachRelation) {
+        foreach (explode('.', $relation) as $index => $eachRelation) {
             $model = $lastQuery->getRelation($eachRelation);
             switch (true) {
                 case $model instanceof BelongsToMany:
@@ -169,19 +169,24 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
 
                 case $model instanceof BelongsTo:
                     $table     = $model->getRelated()->getTable();
+                    $alias     = "alias_{$index}_{$table}";
+                    $tableAs   = "{$table} AS {$alias}";
                     $foreign   = $model->getQualifiedForeignKeyName();
-                    $other     = $model->getQualifiedOwnerKeyName();
+                    $owner     = "{$alias}.{$model->getOwnerKeyName()}";
                     $deletedAt = $this->checkSoftDeletesOnModel($model->getRelated());
+
                     break;
 
                 default:
                     throw new Exception('Relation ' . get_class($model) . ' is not yet supported.');
             }
-            $this->performJoin($table, $foreign, $other, $deletedAt);
+            $this->performJoin($tableAs ?? $table, $foreign, $owner ?? $other, $deletedAt);
             $lastQuery = $model->getQuery();
         }
 
-        return $table . '.' . $relationColumn;
+        $table = $alias ?? $table;
+
+        return "{$table}.{$relationColumn}";
     }
 
     protected function checkSoftDeletesOnModel($model)

tests/Integration/QueryDataTableTest.php

@@ -218,7 +218,7 @@ public function it_allows_search_on_added_column_with_custom_filter_handler()
         ]);
 
         $queries = $crawler->json()['queries'];
-        $this->assertContains('"1" = ?', $queries[1]['query']);
+        $this->assertStringContainsString('"1" = ?', $queries[1]['query']);
     }
 
     protected function setUp(): void