Merge pull request #3232 from Seb33300/order-resolver

feat: add relation resolver param to order callback

Author: yajra

src/QueryDataTable.php

@@ -693,11 +693,10 @@ protected function defaultOrdering(): void
             })
             ->reject(fn ($orderable) => $this->isBlacklisted($orderable['name']) && ! $this->hasOrderColumn($orderable['name']))
             ->each(function ($orderable) {
-                $column = $this->resolveRelationColumn($orderable['name']);
-
                 if ($this->hasOrderColumn($orderable['name'])) {
-                    $this->applyOrderColumn($column, $orderable);
+                    $this->applyOrderColumn($orderable);
                 } else {
+                    $column = $this->resolveRelationColumn($orderable['name']);
                     $nullsLastSql = $this->getNullsLastSql($column, $orderable['direction']);
                     $normalSql = $this->wrap($column).' '.$orderable['direction'];
                     $sql = $this->nullsLast ? $nullsLastSql : $normalSql;
@@ -717,15 +716,15 @@ protected function hasOrderColumn(string $column): bool
     /**
      * Apply orderColumn custom query.
      */
-    protected function applyOrderColumn(string $column, array $orderable): void
+    protected function applyOrderColumn(array $orderable): void
     {
         $sql = $this->columnDef['order'][$orderable['name']]['sql'];
         if ($sql === false) {
             return;
         }
 
         if (is_callable($sql)) {
-            call_user_func($sql, $this->query, $orderable['direction'], $column);
+            call_user_func($sql, $this->query, $orderable['direction'], fn ($column) => $this->resolveRelationColumn($column));
         } else {
             $sql = str_replace('$1', $orderable['direction'], (string) $sql);
             $bindings = $this->columnDef['order'][$orderable['name']]['bindings'];

tests/Integration/CustomOrderTest.php

@@ -54,8 +54,8 @@ protected function setUp(): void
         parent::setUp();
 
         $this->app['router']->get('/relations/belongsTo', fn (DataTables $datatables) => $datatables->eloquent(Post::with('user')->select('posts.*'))
-            ->orderColumn('user.id', function ($query, $order, $column) {
-                $query->orderBy($column, $order == 'desc' ? 'asc' : 'desc');
+            ->orderColumn('user.id', function ($query, $order, $resolver) {
+                $query->orderBy($resolver('user.id'), $order == 'desc' ? 'asc' : 'desc');
             })
             ->toJson());
     }