Commit 3976dcd9 authored by Nick Clark's avatar Nick Clark

Fixed Having

Changed having to perform identical to where
parent 949996fa
......@@ -784,13 +784,19 @@ class MysqliDb
* @return MysqliDb
*/
public function having($havingProp, $havingValue = null, $operator = null)
public function having($havingProp, $havingValue = 'DBNULL', $operator = '=', $cond = 'AND')
{
if ($operator) {
$havingValue = array($operator => $havingValue);
// forkaround for an old operation api
if (is_array($havingValue) && ($key = key($havingValue)) != "0") {
$operator = $key;
$havingValue = $havingValue[$key];
}
if (count($this->_having) == 0) {
$cond = '';
}
$this->_having[] = array("AND", $havingValue, $havingProp);
$this->_having[] = array($cond, $havingProp, $operator, $havingValue);
return $this;
}
......@@ -807,12 +813,7 @@ class MysqliDb
*/
public function orHaving($havingProp, $havingValue = null, $operator = null)
{
if ($operator) {
$havingValue = Array($operator => $havingValue);
}
$this->_having[] = Array("OR", $havingValue, $havingProp);
return $this;
return $this->having($havingProp, $havingValue, $operator, 'OR');
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment