Skip to content

D
doctrine-dbal
Commit 6db507c4 authored by romanb's avatar romanb
Browse files
Options

Some array/object related fixes to hydration

parent 580f21c4
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 5 deletions
lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php
View file @ 6db507c4
...@@ -150,7 +150,8 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte ...@@ -150,7 +150,8 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte
if (count($result) > 1 || count($result[0]) > 1) { if (count($result) > 1 || count($result[0]) > 1) {
throw Doctrine_ORM_Exceptions_HydrationException::nonUniqueResult(); throw Doctrine_ORM_Exceptions_HydrationException::nonUniqueResult();
} }
return array_shift($this->_gatherScalarRowData($result[0], $cache)); $result = $this->_gatherScalarRowData($result[0], $cache);
return array_shift($result);
} }
// Process result set // Process result set
...@@ -245,8 +246,13 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte ...@@ -245,8 +246,13 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte
$driver->getReferenceValue($baseElement, $relationAlias)); $driver->getReferenceValue($baseElement, $relationAlias));
} }
} else if ( ! isset($baseElement[$relationAlias])) { } else if ( ! isset($baseElement[$relationAlias])) {
$driver->setRelatedElement($baseElement, $relationAlias, if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
$driver->getElementCollection($entityName)); $array = array();
$driver->setRelatedElement($baseElement, $relationAlias, $array);
} else {
$driver->setRelatedElement($baseElement, $relationAlias,
$driver->getElementCollection($entityName));
}
} }
} else { } else {
// x-1 relation // x-1 relation
...@@ -260,9 +266,16 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte ...@@ -260,9 +266,16 @@ class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Inte
$driver->getElement($data, $entityName)); $driver->getElement($data, $entityName));
} }
} }
if (($coll =& $driver->getReferenceValue($baseElement, $relationAlias)) !== null) { if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
$this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne); if (($coll =& $driver->getReferenceValue($baseElement, $relationAlias)) !== null) {
$this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);
}
} else {
if (($coll = $driver->getReferenceValue($baseElement, $relationAlias)) !== null) {
$this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);
}
} }
} }
// append scalar values to mixed result sets // append scalar values to mixed result sets
......
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