Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/QueryDataTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,11 @@ public function columnControlSearch(): void
continue;
}

// Only resolve relation after checking for a custom filter.
// Because the custom filter for a column might not be found, e.g., $this->hasFilterColumn($columnName)
// and applyFilterColumn() already resolves relations
$columnName = $this->resolveRelationColumn($columnName);

if ($list) {
if (str_contains($logic, 'not')) {
$this->query->whereNotIn($columnName, $list);
Expand Down
39 changes: 39 additions & 0 deletions tests/Unit/QueryDataTableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use PHPUnit\Framework\Attributes\Test;
use Yajra\DataTables\Tests\Models\User;
use Yajra\DataTables\Tests\TestCase;

Expand Down Expand Up @@ -171,4 +172,42 @@ public function assertQueryHasNoSelect($expected, $query): void

$this->assertSame($expected, Str::startsWith($sql, 'select count(*) from (select 1 as dt_row_count from'), "'{$sql}' has select");
}

#[Test]
public function test_column_name_is_resolved_in_column_control(): void
{
app('datatables.request')->merge([
'columns' => [
[
'name' => 'id',
'data' => 'id',
'searchable' => 'true',
'orderable' => 'true',
'search' => ['value' => null, 'regex' => 'false'],
'columnControl' => [
'search' => [
'value' => '123',
'logic' => 'equal',
'type' => 'num',
],
],
],
],
]);

/** @var \Yajra\DataTables\QueryDataTable $dataTable */
$dataTable = app('datatables')->of(
User::query()
->select('users.*')
->join('role_user', 'users.id', '=', 'role_user.user_id')
->join('roles', 'role_user.role_id', '=', 'roles.id')
);

$dataTable->columnControlSearch();

$this->assertStringContainsString(
'"users"."id" = \'123\'',
$dataTable->getQuery()->toRawSql()
);
}
}
Loading