Put the having clause after the group by clause to resolve this upstr…

…eam issue: http://dev.kohanaframework.org/issues/2923
gallery · Jul 29, 2010 · 941a350 · 941a350
1 parent b3c1b46
commit 941a350
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php
@@ -1021,14 +1021,14 @@ protected function compile()
 			$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))