Doctrine

lib/Doctrine/Hydrator.php

@@ -33 +33 @@
  */
 class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
 {
+    protected $_rootAlias = null;
     /**
      * hydrateResultSet
      * parses the data returned by statement object
@@ -76 +77 @@
         // Used variables during hydration
         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
         $isSimpleQuery = count($this->_queryComponents) <= 1;
@@ -316 +318 @@
             $table = $map['table'];
             $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;
             }
 
             if ($cache[$key]['isIdentifier']) {
@@ -331 +335 @@
                         $fieldName, $value, $cache[$key]['type']);
             }
 
+            // Ticket #1380
+            if ($agg) {
+                $rowData[$this->_rootAlias][$fieldName] = $rowData[$dqlAlias][$fieldName];
+            }
+
             if ( ! isset($nonemptyComponents[$dqlAlias]) && $value !== null) {
                 $nonemptyComponents[$dqlAlias] = true;
             }