From e50f90bf8e0bac44bb8431dc18c29029e22f432b Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 7 May 2012 16:35:01 +1200 Subject: [PATCH] BUGFIX Ensure end bracket for HAVING clause is put in the right place --- model/Database.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/Database.php b/model/Database.php index d52617d0f..96c9c424d 100644 --- a/model/Database.php +++ b/model/Database.php @@ -783,7 +783,7 @@ abstract class SS_Database { * @return string */ public function sqlHavingToString($having) { - return ' HAVING ( ' . implode(' ) AND ( ', $having); + return ' HAVING ( ' . implode(' ) AND ( ', $having) . ')'; } /** @@ -829,7 +829,7 @@ abstract class SS_Database { // these clauses only make sense in SELECT queries, not DELETE if(!$query->getDelete()) { if($query->getGroupBy()) $text .= $this->sqlGroupByToString($query->getGroupBy()); - if($query->getHaving()) $text .= $this->sqlHavingToString($query->getHaving()) . ' )'; + if($query->getHaving()) $text .= $this->sqlHavingToString($query->getHaving()); if($query->getOrderBy()) $text .= $this->sqlOrderByToString($query->getOrderBy()); if($query->getLimit()) $text .= $this->sqlLimitToString($query->getLimit()); }