RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-20 15:31:40 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-05-24 17:49:15 +00:00
parent 755f30f642
commit 2ce1c5f483
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/Hydrate.php
View File

@ -62,7 +62,7 @@ class Doctrine_Hydrate
/**
* @var array $params query input parameters
*/
protected $params = array();
protected $_params = array();
/**
* @var Doctrine_Connection $conn Doctrine_Connection object
*/
@ -84,7 +84,7 @@ class Doctrine_Hydrate
*
* subAgg the subquery aggregates of this component
*/
protected $_aliasMap = array();
protected $_aliasMap = array();
/**
*
*/
@ -386,7 +386,7 @@ class Doctrine_Hydrate
*/
public function getParams()
{
return $this->params;
return $this->_params;
}
/**
* setParams
@ -394,7 +394,7 @@ class Doctrine_Hydrate
* @param array $params
*/
public function setParams(array $params = array()) {
$this->params = $params;
$this->_params = $params;
}
public function convertEnums($params)
{
@ -445,7 +445,7 @@ class Doctrine_Hydrate
*/
public function execute($params = array(), $return = Doctrine::FETCH_RECORD)
{
$params = $this->_conn->convertBooleans(array_merge($this->params, $params));
$params = $this->_conn->convertBooleans(array_merge($this->_params, $params));
$params = $this->convertEnums($params);
if ( ! $this->_view) {

2
lib/Doctrine/Query.php
View File

@ -1133,7 +1133,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
$params = array($params);
}
// append parameters
$params = array_merge($this->params, $params);
$params = array_merge($this->_params, $params);
return (int) $this->getConnection()->fetchOne($q, $params);
}

20
lib/Doctrine/Query/Abstract.php
View File

@ -54,9 +54,9 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
public function addWhere($where, $params = array())
{
if (is_array($params)) {
$this->params = array_merge($this->params, $params);
$this->_params = array_merge($this->_params, $params);
} else {
$this->params[] = $params;
$this->_params[] = $params;
}
return $this->parseQueryPart('where', $where, true);
}
@ -82,9 +82,9 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
public function addHaving($having, $params = array())
{
if (is_array($params)) {
$this->params = array_merge($this->params, $params);
$this->_params = array_merge($this->_params, $params);
} else {
$this->params[] = $params;
$this->_params[] = $params;
}
return $this->parseQueryPart('having', $having, true);
}
@ -227,11 +227,11 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
*/
public function where($where, $params = array())
{
$this->params = array();
$this->_params = array();
if (is_array($params)) {
$this->params = $params;
$this->_params = $params;
} else {
$this->params[] = $params;
$this->_params[] = $params;
}
return $this->parseQueryPart('where', $where);
@ -246,11 +246,11 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
*/
public function having($having, $params = array())
{
$this->params = array();
$this->_params = array();
if (is_array($params)) {
$this->params = $params;
$this->_params = $params;
} else {
$this->params[] = $params;
$this->_params[] = $params;
}
return $this->parseQueryPart('having', $having);