Added HAVING clause to query builder

Also whitespace fixes Issue #20
jeroenrnl · Jun 29, 2015 · 8065610 · 8065610
1 parent 274c930
commit 8065610
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 6 deletions.
diff --git a/UnitTests/PDOdatabaseTest.php b/UnitTests/PDOdatabaseTest.php
@@ -84,6 +84,48 @@ public function testQueryWithClause() {
 
     }
 
+    /**
+     * Test a SELECT query with a GROUP BY and HAVING clause
+     */
+    public function testQueryWithGroupBy() {
+
+        $qry=new select("photos");
+        $qry->addGroupBy("album");
+        $having=new clause("album_id > :albid");
+        $qry->addParam(new param(":albid", 5, PDO::PARAM_INT));
+
+        $qry->having($having);
+
+        $sql=(string) $qry;
+        $exp_sql="SELECT * FROM zoph_photos GROUP BY album HAVING (album_id > :albid);";
+
+        $this->assertEquals($exp_sql, $sql);
+
+        unset($qry);
+        unset($clause);
+
+        $qry=new select("photos");
+        $qry->addGroupBy("album");
+        $where=new clause("photo_id > :photoid");
+        $having=new clause("album_id > :albid");
+        $qry->addParams(array(
+            new param(":photoid", 10, PDO::PARAM_INT),
+            new param(":albid", 5, PDO::PARAM_INT)
+        ));
+
+        $qry->where($where);
+        $qry->having($having);
+
+        $sql=(string) $qry;
+        $exp_sql="SELECT * FROM zoph_photos WHERE (photo_id > :photoid) GROUP BY album HAVING (album_id > :albid);";
+
+        $this->assertEquals($exp_sql, $sql);
+
+        unset($qry);
+        unset($clause);
+
+    }
+
     /**
      * Test a SELECT query with a JOIN clause
      */

diff --git a/php/classes/query.inc.php b/php/classes/query.inc.php
@@ -41,6 +41,8 @@ abstract class query {
     protected $params=null;
     /** @var string WHERE clause */
     protected $clause=null;
+    /** @var string HAVING clause */
+    protected $having=null;
     /** @var array ORDER clause */
     protected $order=array();
     /** @var array count for LIMIT clause */
@@ -164,6 +166,16 @@ public function where(clause $clause) {
         return $this;
     }
 
+    /**
+     * Add a HAVING clause to the query
+     * @param clause HAVING clause
+     * @return query return the query to enable chaining
+     */
+    public function having(clause $clause) {
+        $this->having=$clause;
+        return $this;
+    }
+
     /**
      * Add ORDER BY clause to query
      * @param string order to add

diff --git a/php/classes/select.inc.php b/php/classes/select.inc.php
@@ -8,7 +8,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Zoph is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -52,15 +52,15 @@ public function join($table, $on, $jointype="INNER") {
         }
 
         $table=db::getPrefix() . $table;
-        
+
         if (!in_array($jointype, array("INNER", "LEFT", "RIGHT"))) {
             throw new DatabaseException("Unknown JOIN type");
         }
         $this->joins[]=$jointype . " JOIN " . $table . " ON " . $on;
         return $this;
     }
 
-    /** 
+    /**
      * Add GROUP BY clause to query
      * @param string GRPUP BY to add
      * @return query return the query to enable chaining
@@ -70,7 +70,7 @@ public function addGroupBy($group) {
         return $this;
     }
 
-    /** 
+    /**
      * Get GROUP BY for query
      * @return string GROUP clause
      */
@@ -86,7 +86,7 @@ private function getGroupBy() {
     /**
      * Execute query
      */
-    public function execute() { 
+    public function execute() {
         return db::query($this);
     }
 
@@ -116,12 +116,16 @@ public function __toString() {
         if($this->clause instanceof clause) {
             $sql .= " WHERE " . $this->clause;
         }
-       
+
         $groupby=trim($this->getGroupBy());
         if(!empty($groupby)) {
             $sql .= " " . $groupby;
         }
 
+        if($this->having instanceof clause) {
+            $sql .= " HAVING " . $this->having;
+        }
+
         $order=trim($this->getOrder());
         if(!empty($order)) {
             $sql .= " " . $order;