Skip to content

improve performance || is complex query #3133

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

Closed
wants to merge 8 commits into from
Closed

improve performance || is complex query #3133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2a3ab60
improve performance || is complex query
abdulrhmansouda Apr 9, 2024
cecf821
improve performance code
abdulrhmansouda Apr 11, 2024
9773f3e
Update QueryDataTableTest.php
abdulrhmansouda Apr 13, 2024
3c7bf04
Update QueryDataTableTest.php
abdulrhmansouda Apr 13, 2024
33dfab5
Update QueryDataTableTest.php
abdulrhmansouda Apr 13, 2024
a4fe13a
Update QueryDataTableTest.php
abdulrhmansouda Apr 13, 2024
8a9104a
Update QueryDataTableTest.php
abdulrhmansouda Apr 13, 2024
8a798df
Update QueryDataTableTest.php
abdulrhmansouda Apr 13, 2024
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
6 changes: 4 additions & 2 deletions src/QueryDataTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public function prepareCountQuery(): QueryBuilder
}

$row_count = $this->wrap('row_count');
$builder->select($this->getConnection()->raw("'1' as {$row_count}"));
$builder->select($this->getConnection()->raw("'1' as {$row_count}"))->reorder();
if (! $this->keepSelectBindings) {
$builder->setBindings([], 'select');
}
Expand All @@ -205,7 +205,9 @@ public function prepareCountQuery(): QueryBuilder
*/
protected function isComplexQuery($query): bool
{
return Str::contains(Str::lower($query->toSql()), ['union', 'having', 'distinct', 'order by', 'group by']);
$queryCheck = (clone $query)->select(DB::raw('1 AS dt_row_count'));

return Str::contains(Str::lower($queryCheck->toSql()), ['union', 'having', 'distinct', 'group by']);
}

/**
Expand Down
12 changes: 6 additions & 6 deletions tests/Unit/QueryDataTableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function test_complex_query_use_select_in_count()
$this->assertEquals(20, $dataTable->count());
}

public function test_complex_query_can_ignore_select_in_count()
public function test_simple_query_can_ignore_select_in_count()
{
/** @var \Yajra\DataTables\QueryDataTable $dataTable */
$dataTable = app('datatables')->of(
Expand All @@ -70,11 +70,11 @@ public function test_complex_query_can_ignore_select_in_count()
)
)->ignoreSelectsInCountQuery();

$this->assertQueryHasNoSelect(true, $dataTable->prepareCountQuery());
$this->assertQueryHasNoSelect(false, $dataTable->prepareCountQuery());
$this->assertEquals(20, $dataTable->count());
}

public function test_simple_queries_with_complexe_select_are_wrapped_without_selects()
public function test_simple_queries_with_simple_select_are_wrapped_without_selects()
{
/** @var \Yajra\DataTables\QueryDataTable $dataTable */
$dataTable = app('datatables')->of(
Expand All @@ -88,8 +88,8 @@ public function test_simple_queries_with_complexe_select_are_wrapped_without_sel
])
);

$this->assertQueryWrapped(true, $dataTable->prepareCountQuery());
$this->assertQueryHasNoSelect(true, $dataTable->prepareCountQuery());
$this->assertQueryWrapped(false, $dataTable->prepareCountQuery());
// $this->assertQueryHasNoSelect(true, $dataTable->prepareCountQuery());
$this->assertEquals(20, $dataTable->count());
}

Expand Down Expand Up @@ -136,6 +136,6 @@ public function assertQueryHasNoSelect($expected, $query)
{
$sql = $query->toSql();

$this->assertSame($expected, Str::startsWith($sql, 'select * from (select 1 as dt_row_count from'), "'{$sql}' is not wrapped");
$this->assertSame($expected, Str::startsWith($sql, 'select * from (select 1 as dt_row_count from') || Str::startsWith($sql, 'select * from (select 1 as row_count from'), "'{$sql}' is not wrapped");
}
}