tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUG count breaks when having clause defined

Browse Source
This commit is contained in:
Aram Balakjian 2015-04-30 16:04:26 +01:00 committed by Daniel Hensby
parent e94c2a944e
commit be10d90cc5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
model/SQLQuery.php
View File

@ -1038,8 +1038,13 @@ class SQLQuery {
* @return int * @return int
*/ */
public function count( $column = null) { public function count( $column = null) {
// we can't clear the select if we're relying on its output by a HAVING clause
if(!empty($this->having)) {
$records = $this->execute();
return $records->numRecords();
}
// Choose a default column // Choose a default column
if($column == null) { elseif($column == null) {
if($this->groupby) { if($this->groupby) {
$column = 'DISTINCT ' . implode(", ", $this->groupby); $column = 'DISTINCT ' . implode(", ", $this->groupby);
} else { } else {