Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.x] Fix create eloquent datatable from relation #2789

Merged
merged 2 commits into from
May 23, 2022
Merged

[10.x] Fix create eloquent datatable from relation #2789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f83c9ca
Create eloquent datatable from relation
May 20, 2022
97c3bd9
Declare types in EloquentDatatable contructor and remove exception
May 21, 2022
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
29 changes: 13 additions & 16 deletions src/EloquentDataTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\Relations\Relation;
use Yajra\DataTables\Exceptions\Exception;

/**
Expand All @@ -19,22 +20,15 @@ class EloquentDataTable extends QueryDataTable
/**
* EloquentEngine constructor.
*
* @param \Illuminate\Database\Eloquent\Model|EloquentBuilder $model
*
* @throws \Yajra\DataTables\Exceptions\Exception
* @param Model|EloquentBuilder $model
*/
public function __construct($model)
public function __construct(Model|EloquentBuilder $model)
{
switch ($model) {
case $model instanceof Model:
$builder = $model->newQuery();
break;
case $model instanceof EloquentBuilder:
$builder = $model;
break;
default:
throw new Exception('Invalid model type. Must be an instance of Eloquent Model or Eloquent Builder.');
}
$builder = match (true) {
$model instanceof Model => $model->newQuery(),
$model instanceof Relation => $model->getQuery(),
$model instanceof EloquentBuilder => $model,
};

parent::__construct($builder->getQuery());

Expand Down Expand Up @@ -100,10 +94,13 @@ protected function compileQuerySearch($query, string $column, string $keyword, s
}

if ($this->isMorphRelation($relation)) {
$query->{$boolean.'WhereHasMorph'}($relation, '*',
$query->{$boolean.'WhereHasMorph'}(
$relation,
'*',
function (EloquentBuilder $query) use ($newColumn, $keyword) {
parent::compileQuerySearch($query, $newColumn, $keyword, '');
});
}
);
} else {
$query->{$boolean.'WhereHas'}($relation, function (EloquentBuilder $query) use ($newColumn, $keyword) {
parent::compileQuerySearch($query, $newColumn, $keyword, '');
Expand Down
11 changes: 11 additions & 0 deletions tests/Integration/EloquentDataTableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,17 @@ public function it_can_return_formatted_columns()
$this->assertEquals(Carbon::parse($user->created_at)->format('Y-m-d'), $data['created_at_formatted']);
}

/** @test */
public function it_accepts_a_relation()
{
$user = User::first();

$dataTable = app('datatables')->eloquent($user->posts());
$response = $dataTable->toJson();
$this->assertInstanceOf(EloquentDataTable::class, $dataTable);
$this->assertInstanceOf(JsonResponse::class, $response);
}

protected function setUp(): void
{
parent::setUp();
Expand Down