Doctrine

Timestamp:

02/15/08 19:32:53 (17 months ago)

Author:

jwage

Message:

Reverting some changes that were included in the 0.10 branch from trunk that should not have been. They were refactorings related to the inheritance changes in progress by romanb. The code was reverted to the state it was in 0.9 so the inheritance yaml schema file definitions will work correctly.

Location:

branches/0.10/lib/Doctrine/Import

Files:

• Builder.php (modified) (3 diffs)
• Schema.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Import/Builder.php

@@ -278 +278 @@
     public function buildTableDefinition(array $definition)
     {
-        // If the inheritance type if simple or column aggregation then we do not need a table definition
-        if (isset($definition['inheritance']['type']) && ($definition['inheritance']['type'] == 'simple' || $definition['inheritance']['type'] == 'aggregation')) {
-            return;
-        }
-        
         $ret = array();
         
@@ -315 +310 @@
         if (isset($definition['options']) && is_array($definition['options']) && !empty($definition['options'])) {
             $ret[$i] = $this->buildOptions($definition['options']);
-            $i++;
-        }
-        
-        if (isset($definition['subclasses']) && is_array($definition['subclasses']) && !empty($definition['subclasses'])) {
-            $ret[$i] = '    $this->setSubclasses(' . var_export($definition['subclasses'], true) . ');';
             $i++;
         }
@@ -404 +394 @@
                 $i++;
             }
+        }
+
+        if (isset($definition['inheritance']['keyField']) && isset($definition['inheritance']['keyValue'])) {
+            $i++;
+            $ret[$i] = "    ".'$this->setInheritanceMap(array(\''.$definition['inheritance']['keyField'].'\' => \''.$definition['inheritance']['keyValue'].'\'));';
         }
 

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

@@ -184 +184 @@
                           'package'             =>  null,
                           'inheritance'         =>  array(),
-                          'subclasses'          =>  array(),
                           'detect_relations'    =>  false,
                           'generate_accessors'  =>  false);