Changeset 5209 for branches/1.0/lib

Timestamp:

11/21/08 16:42:15 (7 weeks ago)

Author:

guilhermeblanco

Message:

[1.0, 1.1] fixes #1621. Fixed inheritance with M2M relations + aliases. Third needed part of this patch.

Files:

• branches/1.0/lib/Doctrine/Record/Abstract.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Record/Abstract.php

@@ -129 +129 @@
     {
         if (isset($map[get_class($this)])) {
-            $this->_table->setOption('inheritanceMap', $map[get_class($this)]);
+            // fix for #1621 
+            $mapFieldNames = $map[get_class($this)]; 
+            $mapColumnNames = array(); 
+
+            foreach ($mapFieldNames as $fieldName => $val) { 
+                $mapColumnNames[$this->getTable()->getColumnName($fieldName)] = $val; 
+            }
+ 
+            $this->_table->setOption('inheritanceMap', $mapColumnNames);
             return;
         }