Commit 34a54f52 authored by zYne's avatar zYne

--no commit message

--no commit message
parent afda33da
......@@ -569,16 +569,14 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
* @param array $row
* @return Doctrine_Record
*/
public function mapAggregateValues($record, array $row, $alias)
public function mapAggregateValues(&$record, array $row, $alias)
{
$found = false;
// aggregate values have numeric keys
if (isset($row[0])) {
// map each aggregate value
foreach ($row as $index => $value) {
$agg = false;
if (isset($this->_aliasMap[$alias]['agg'][$index])) {
$agg = $this->_aliasMap[$alias]['agg'][$index];
}
......@@ -590,7 +588,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
}
$found = true;
}
}
return $found;
}
public function getCachedForm(array $resultSet)
......@@ -621,6 +619,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
$query = $this->_view->getSelectSql();
}
if ($this->isLimitSubqueryUsed() &&
$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)) {
$parse = true;
foreach ($data as $key => $value) {
......
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