Skip to content

D
doctrine-dbal
Commit d4668307 authored by chtito's avatar chtito
Browse files
Options

fixes for #218 and #219

parent 1727a3e9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
lib/Doctrine/Query.php
View file @ d4668307
...@@ -218,6 +218,8 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable { ...@@ -218,6 +218,8 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
if( ! empty($having)) if( ! empty($having))
$q .= ' HAVING ' . implode(' AND ',$having); $q .= ' HAVING ' . implode(' AND ',$having);
$params = array_merge($this->params, $params);
$a = $this->getConnection()->execute($q, $params)->fetch(PDO::FETCH_NUM); $a = $this->getConnection()->execute($q, $params)->fetch(PDO::FETCH_NUM);
return $a[0]; return $a[0];
} }
...@@ -347,6 +349,8 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable { ...@@ -347,6 +349,8 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
$parser->parse($args[0]); $parser->parse($args[0]);
break; break;
case 'where': case 'where':
call_user_func_array(array($this, 'addWhere'), $args);
break;
case 'having': case 'having':
case 'orderby': case 'orderby':
case 'groupby': case 'groupby':
......
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