Doctrine

Timestamp:

01/25/08 07:41:09 (18 months ago)

Author:

dbrewer

Message:

#749: fixed a problem with r3630: subclass inheritance map in parseData
is now properly maintained for each alias.

Files:

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

branches/0.9/lib/Doctrine/Hydrate.php

@@ -1056 +1056 @@
         // large result sets can be quite expensive.
         // So for efficiency we use little listener caching here
+        //
+        // We also cache information about subclasses of the involved tables,
+        // because 
+
         foreach ($this->_aliasMap as $alias => $data) {
             $componentName = $data['table']->getComponentName();
@@ -1065 +1069 @@
             
             $subclassMap[$alias] = array();
-            $subclassInheritanceMap = array();
+            $subclassInheritanceMap[$alias] = array();
             
             // cache record listeners for subclasses of all involved tables
@@ -1075 +1079 @@
                         $subclass_table = $this->_conn->getTable($subclass);
                         $listeners[$subclass] = $subclass_table->getRecordListener();
-                        $subclassInheritanceMap[$subclass] = $subclass_table->inheritanceMap;
+                        $subclassInheritanceMap[$alias][$subclass] = $subclass_table->getOption('inheritanceMap');
                     }
                }
             }
         }
-
         while ($data = $stmt->fetch(Doctrine::FETCH_ASSOC)) {
             $currData  = array();
@@ -1123 +1126 @@
             $componentName = false;
             foreach ($subclassMap[$rootAlias] as $subclass) {
-                if (array_key_exists($subclass, $subclassInheritanceMap)) {
-                    foreach ($subclassInheritanceMap[$subclass] as $key => $value) {
+                if (isset($subclassInheritanceMap[$rootAlias][$subclass])) {
+                    foreach ($subclassInheritanceMap[$rootAlias][$subclass] as $key => $value) {
                         if (isset($currData[$rootAlias][$key]) && $currData[$rootAlias][$key] == $value) {
                             $subclass_table = $this->_conn->getTable($subclass);