Doctrine

Timestamp:

10/21/08 20:52:26 (9 months ago)

Author:

jwage

Message:

[1.0, 1.1] fixes #1563

Location:

branches

Files:

• 1.0/lib/Doctrine/Import/Schema.php (modified) (2 diffs)
• 1.1/lib/Doctrine/Import/Schema.php (modified) (2 diffs)

branches/1.0/lib/Doctrine/Import/Schema.php

@@ -472 +472 @@
         // Array of the array keys to move to the parent, and the value to default the child definition to
         // after moving it. Will also populate the subclasses array for the inheritance parent
-        $moves = array('columns' => array());
+        $moves = array('columns' => array(),
+                       'indexes' => array(),
+                       'attributes' => array(),
+                       'options' => array(),
+                       'checks' => array());
         
         foreach ($array as $className => $definition) {
@@ -479 +483 @@
                 $parent = $this->_findBaseSuperClass($array, $definition['className']);
                 foreach ($moves as $move => $resetValue) {
-                    $array[$parent][$move] = Doctrine_Lib::arrayDeepMerge($array[$parent][$move], $definition[$move]);
-                    $array[$definition['className']][$move] = $resetValue;
+                    if (isset($array[$parent][$move]) && isset($definition[$move])) {
+                        $array[$parent][$move] = Doctrine_Lib::arrayDeepMerge($array[$parent][$move], $definition[$move]);
+                        $array[$definition['className']][$move] = $resetValue;
+                    }
                 }
 

branches/1.1/lib/Doctrine/Import/Schema.php

@@ -472 +472 @@
         // Array of the array keys to move to the parent, and the value to default the child definition to
         // after moving it. Will also populate the subclasses array for the inheritance parent
-        $moves = array('columns' => array());
+        $moves = array('columns' => array(),
+                       'indexes' => array(),
+                       'attributes' => array(),
+                       'options' => array(),
+                       'checks' => array());
         
         foreach ($array as $className => $definition) {
@@ -479 +483 @@
                 $parent = $this->_findBaseSuperClass($array, $definition['className']);
                 foreach ($moves as $move => $resetValue) {
-                    $array[$parent][$move] = Doctrine_Lib::arrayDeepMerge($array[$parent][$move], $definition[$move]);
-                    $array[$definition['className']][$move] = $resetValue;
+                    if (isset($array[$parent][$move]) && isset($definition[$move])) {
+                        $array[$parent][$move] = Doctrine_Lib::arrayDeepMerge($array[$parent][$move], $definition[$move]);
+                        $array[$definition['className']][$move] = $resetValue;
+                    }
                 }