Skip to content

Update ActiveDataProvider::prepareModels() to avoid SQL error with UNION queries #20246

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update ActiveDataProvider::prepareModels() to avoid SQL error with UNION queries #20246

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6356e60
Update ActiveDataProvider::prepareModels() to avoid SQL error with UN…
cepaim Aug 16, 2024
a1807f9
Merge pull request #1 from cepaim/cepaim-prepareModels-union
cepaim Aug 16, 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
16 changes: 14 additions & 2 deletions framework/data/ActiveDataProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,29 @@
throw new InvalidConfigException('The "query" property must be an instance of a class that implements the QueryInterface e.g. yii\db\Query or its subclasses.');
}
$query = clone $this->query;

$has_union = $query->union && count($query->union);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$has_union = $query->union && count($query->union);
$hasUnion = $query->union && count($query->union);

if (($pagination = $this->getPagination()) !== false) {
$pagination->totalCount = $this->getTotalCount();
if ($pagination->totalCount === 0) {
return [];
}
$query->limit($pagination->getLimit())->offset($pagination->getOffset());
if ($has_union) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if ($has_union) {
if ($hasUnion) {

$query->union[count($query->union)-1]['query']->limit($pagination->getLimit())->offset($pagination->getOffset());

Check warning on line 112 in framework/data/ActiveDataProvider.php

View check run for this annotation

Codecov / codecov/patch

framework/data/ActiveDataProvider.php#L112 

Added line #L112 was not covered by tests
} else {
$query->limit($pagination->getLimit())->offset($pagination->getOffset());
}
}
if (($sort = $this->getSort()) !== false) {
$query->addOrderBy($sort->getOrders());
}
if ($has_union) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if ($has_union) {
if ($hasUnion) {

if ($query->orderBy) {
$query->union[count($query->union)-1]['query']->addOrderBy($query->orderBy);
$query->orderBy = null;

Check warning on line 123 in framework/data/ActiveDataProvider.php

View check run for this annotation

Codecov / codecov/patch

framework/data/ActiveDataProvider.php#L121-L123 

Added lines #L121 - L123 were not covered by tests
}
}

return $query->all($this->db);
}

Expand Down