RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Browse source
This commit is contained in:
zYne 2007-06-13 11:02:30 +00:00
parent afda33da13
commit 34a54f52f8
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/Doctrine/Hydrate.php
View file

@ -569,28 +569,26 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
* @param array $row * @param array $row
* @return Doctrine_Record * @return Doctrine_Record
*/ */
public function mapAggregateValues($record, array $row, $alias) public function mapAggregateValues(&$record, array $row, $alias)
{ {
$found = false; $found = false;
// aggregate values have numeric keys
if (isset($row[0])) {
// map each aggregate value
foreach ($row as $index => $value) {
$agg = false;
// map each aggregate value
foreach ($row as $index => $value) {
$agg = false;
if (isset($this->_aliasMap[$alias]['agg'][$index])) { if (isset($this->_aliasMap[$alias]['agg'][$index])) {
$agg = $this->_aliasMap[$alias]['agg'][$index]; $agg = $this->_aliasMap[$alias]['agg'][$index];
}
if (is_array($record)) {
$record[$agg] = $value;
} else {
$record->mapValue($agg, $value);
}
$found = true;
} }
if (is_array($record)) {
$record[$agg] = $value;
} else {
$record->mapValue($agg, $value);
}
$found = true;
} }
return $found; return $found;
} }
public function getCachedForm(array $resultSet) public function getCachedForm(array $resultSet)
@ -614,13 +612,14 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
{ {
$params = $this->_conn->convertBooleans(array_merge($this->_params, $params)); $params = $this->_conn->convertBooleans(array_merge($this->_params, $params));
$params = $this->convertEnums($params); $params = $this->convertEnums($params);
if ( ! $this->_view) { if ( ! $this->_view) {
$query = $this->getQuery($params); $query = $this->getQuery($params);
} else { } else {
$query = $this->_view->getSelectSql(); $query = $this->_view->getSelectSql();
} }
if ($this->isLimitSubqueryUsed() && if ($this->isLimitSubqueryUsed() &&
$this->_conn->getDBH()->getAttribute(Doctrine::ATTR_DRIVER_NAME) !== 'mysql') { $this->_conn->getDBH()->getAttribute(Doctrine::ATTR_DRIVER_NAME) !== 'mysql') {
@ -805,6 +804,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
} }
while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
$parse = true; $parse = true;
foreach ($data as $key => $value) { foreach ($data as $key => $value) {