php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 05:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #11122: Fixed can not use orderBy with aggregate functions (#12772)

Browse Source 
* refs #11122: Fixed can not use `orderBy` with aggregate functions like `count`, `max` etc.

* Update QueryTest.php
This commit is contained in:
Pavel Chaplygin
2016-12-18 16:28:34 +07:00
committed by Dmitry Naumenko
parent a710345ea7
commit 25e6eb04a5
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/db/Query.php
View File

@ -421,7 +421,13 @@ class Query extends Component implements QueryInterface
$this->limit = $limit;
$this->offset = $offset;
if (empty($this->groupBy) && empty($this->having) && empty($this->union) && !$this->distinct) {
if (
!$this->distinct
&& empty($this->groupBy)
&& empty($this->having)
&& empty($this->union)
&& empty($this->orderBy)
) {
return $command->queryScalar();
} else {
return (new Query)->select([$selectExpression])