Doctrine

Timestamp:

03/10/08 02:41:15 (2 years ago)

Author:

jwage

Message:

fixes #796 fixes #797

Files:

• branches/0.10/lib/Doctrine/Import/Builder.php (modified) (5 diffs)

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

@@ -312 +312 @@
     public function buildTableDefinition(array $definition)
     {
+        if (isset($definition['inheritance']['type']) && $definition['inheritance']['type'] == 'simple') {
+            return;
+        }
+        
         $ret = array();
         
         $i = 0;
         
-        if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) {
+        if (isset($definition['inheritance']['type']) && $definition['inheritance']['type'] == 'concrete') {
             $ret[$i] = "    parent::setTableDefinition();";
             $i++;
@@ -323 +327 @@
         if (isset($definition['tableName']) && !empty($definition['tableName'])) {
             $ret[$i] = "    ".'$this->setTableName(\''. $definition['tableName'].'\');';
-            
             $i++;
         }
@@ -344 +347 @@
         if (isset($definition['options']) && is_array($definition['options']) && !empty($definition['options'])) {
             $ret[$i] = $this->buildOptions($definition['options']);
+            $i++;
+        }
+        
+        if (isset($definition['inheritance']['subclasses']) && ! empty($definition['inheritance']['subclasses'])) {
+            $ret[$i] = "    ".'$this->setSubClasses('. $this->varExport($definition['inheritance']['subclasses']).');';
             $i++;
         }
@@ -364 +372 @@
      */
     public function buildSetUp(array $definition)
-    {   
+    {
+        if (isset($definition['inheritance']['type']) && ($definition['inheritance']['type'] == 'simple' || $definition['inheritance']['type'] == 'column_aggregation')) {
+            return;
+        }
+
         $ret = array();
         $i = 0;
         
-        if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) {
+        if (isset($definition['inheritance']['type']) && $definition['inheritance']['type'] == 'concrete') {
             $ret[$i] = "    parent::setUp();";
             $i++;
@@ -428 +440 @@
                 $i++;
             }
-        }
-
-        if (isset($definition['inheritance']['keyField']) && isset($definition['inheritance']['keyValue'])) {
-            $i++;
-            $ret[$i] = "    ".'$this->setInheritanceMap(array(\''.$definition['inheritance']['keyField'].'\' => \''.$definition['inheritance']['keyValue'].'\'));';
         }