Changeset 4993

Timestamp:

09/26/08 21:14:01 (3 months ago)

Author:

jwage

Message:

[1.0] fixes #1380 Hydrating calculated columns to base component

Files:

• branches/1.0/lib/Doctrine/Hydrator.php (modified) (4 diffs)

branches/1.0/lib/Doctrine/Hydrator.php

@@ -34 +34 @@
 class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
 {
+    protected $_rootAlias = null;
     /**
      * hydrateResultSet
@@ -77 +78 @@
         reset($this->_queryComponents);
         $rootAlias = key($this->_queryComponents);
+        $this->_rootAlias = $rootAlias;
         $rootComponentName = $this->_queryComponents[$rootAlias]['table']->getComponentName();
         // if only one component is involved we can make our lives easier
@@ -317 +319 @@
             $dqlAlias = $cache[$key]['dqlAlias'];
             $fieldName = $cache[$key]['fieldName'];
+            $agg = false;
             if (isset($this->_queryComponents[$dqlAlias]['agg'][$fieldName])) {
                 $fieldName = $this->_queryComponents[$dqlAlias]['agg'][$fieldName];
+                $agg = true;
             }
 
@@ -330 +334 @@
                 $rowData[$dqlAlias][$fieldName] = $table->prepareValue(
                         $fieldName, $value, $cache[$key]['type']);
+            }
+
+            // Ticket #1380
+            // Hydrate aggregates in to the root component as well.
+            // So we know that all aggregate values will always be available in the root component
+            if ($agg) {
+                $rowData[$this->_rootAlias][$fieldName] = $rowData[$dqlAlias][$fieldName];
             }