Doctrine

Timestamp:

01/25/08 07:14:07 (18 months ago)

Author:

dbrewer

Message:

#749: fixed issue with hydrating rows of a result set when column
aggregation inheritence is involved.

Files:

• branches/0.9/lib/Doctrine/Hydrate.php (modified) (2 diffs)

branches/0.9/lib/Doctrine/Hydrate.php

@@ -1063 +1063 @@
             $prev[$alias] = array();
             $id[$alias] = '';
+            
+            $subclassMap[$alias] = array();
+            $subclassInheritanceMap = array();
+            
+            // cache record listeners for subclasses of all involved tables
+            if ($subclasses = $data['table']->subclasses) {
+                $subclassMap[$alias] = $subclasses;
+
+                foreach ($subclasses as $subclass) {
+                    if ($componentName != $subclass) {
+                        $subclass_table = $this->_conn->getTable($subclass);
+                        $listeners[$subclass] = $subclass_table->getRecordListener();
+                        $subclassInheritanceMap[$subclass] = $subclass_table->inheritanceMap;
+                    }
+               }
+            }
         }
 
@@ -1103 +1119 @@
             // dealing with root component
             $table = $this->_aliasMap[$rootAlias]['table'];
-            $componentName = $table->getComponentName();
+
+            // check if this matches any subclasses
+            $componentName = false;
+            foreach ($subclassMap[$rootAlias] as $subclass) {
+                if (array_key_exists($subclass, $subclassInheritanceMap)) {
+                    foreach ($subclassInheritanceMap[$subclass] as $key => $value) {
+                        if (isset($currData[$rootAlias][$key]) && $currData[$rootAlias][$key] == $value) {
+                            $subclass_table = $this->_conn->getTable($subclass);
+                            $componentName = $subclass_table->getComponentName();
+                        }
+                    }
+                }
+            }
+
+            // if it didn't match any subclasses, just use the name of the table
+            if (!$componentName) $componentName = $table->getComponentName();
+
             $event->set('data', $currData[$rootAlias]);
             $listeners[$componentName]->preHydrate($event);