Merge pull request #2850 from Koudy/db-query-queryScalar

Fixed getting the count for queries with the union

Merge pull request #2850 from Koudy/db-query-queryScalar
7f6f3f6f · Qiang Xue · b393ea0d · 411dc71b · 7f6f3f6f
Commit 7f6f3f6f authored Mar 22, 2014 by Qiang Xue
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Query.php framework/db/Query.php +1 -1

No files found.
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -359,7 +359,7 @@ class Query extends Component implements QueryInterface
        $this->limit = $limit;
        $this->offset = $offset;

-        if (empty($this->groupBy) && !$this->distinct) {
+        if (empty($this->groupBy) && empty($this->union) && !$this->distinct) {
            return $command->queryScalar();
        } else {
            return (new Query)->select([$selectExpression])