diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-29 06:59:44 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-29 06:59:44 -0700 |
| commit | 529b9ac56c4997ec095a03580b13110e56ed1d14 (patch) | |
| tree | d7577212bbaed0720d50cd6d803c08031348eb69 /system/libraries/Database_Builder.php | |
| parent | 64eae641e5db841b89d67c69634ed409992eed54 (diff) | |
| parent | 941a350691c267e3b417eb461bdc9d499ee10598 (diff) | |
Merge branch 'master' into dialog
Diffstat (limited to 'system/libraries/Database_Builder.php')
| -rw-r--r-- | system/libraries/Database_Builder.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php index 62b2a163..e86ce379 100644 --- a/system/libraries/Database_Builder.php +++ b/system/libraries/Database_Builder.php @@ -1021,14 +1021,14 @@ class Database_Builder_Core { $sql .= "\n".'WHERE '.$this->compile_conditions($this->where); } - if ( ! empty($this->having)) + if ( ! empty($this->group_by)) { - $sql .= "\n".'HAVING '.$this->compile_conditions($this->having); + $sql .= "\n".'GROUP BY '.$this->compile_group_by(); } - if ( ! empty($this->group_by)) + if ( ! empty($this->having)) { - $sql .= "\n".'GROUP BY '.$this->compile_group_by(); + $sql .= "\n".'HAVING '.$this->compile_conditions($this->having); } if ( ! empty($this->order_by)) |