Changeset 4965 for trunk/lib/Doctrine

Timestamp:

09/13/08 21:06:49 (4 months ago)

Author:

romanb

Message:

Some array/object related fixes to hydration

Files:

• trunk/lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php (modified) (3 diffs)

trunk/lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php

@@ -151 +151 @@
                 throw Doctrine_ORM_Exceptions_HydrationException::nonUniqueResult();
             }
-            return array_shift($this->_gatherScalarRowData($result[0], $cache)); 
+            $result = $this->_gatherScalarRowData($result[0], $cache);
+            return array_shift($result);
         }
         
@@ -246 +247 @@
                         }
                     } else if ( ! isset($baseElement[$relationAlias])) {
-                        $driver->setRelatedElement($baseElement, $relationAlias,
-                                $driver->getElementCollection($entityName));
+                        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+                            $array = array();
+                            $driver->setRelatedElement($baseElement, $relationAlias, $array);
+                        } else {
+                            $driver->setRelatedElement($baseElement, $relationAlias,
+                                    $driver->getElementCollection($entityName));
+                        }
                     }
                 } else {
@@ -261 +267 @@
                     }
                 }
-                if (($coll =& $driver->getReferenceValue($baseElement, $relationAlias)) !== null) {
-                    $this->_updateResultPointer($resultPointers, $coll, $index, $dqlAlias, $oneToOne);   
-                }
+                if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+                    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);   
+                    }
+                }
+
             }