Doctrine

Timestamp:

03/10/08 21:55:24 (16 months ago)

Author:

jwage

Message:

fixes #835

Location:

branches/0.10

Files:

• lib/Doctrine/Import/Schema.php (modified) (3 diffs)
• tests/schema.yml (modified) (3 diffs)

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

@@ -412 +412 @@
                 $class = isset($relation['class']) ? $relation['class']:$alias;
                 
+                $relation['class'] = $class;
+                $relation['alias'] = isset($relation['alias']) ? $relation['alias'] : $alias;
+                
                 // Attempt to guess the local and foreign
                 if (isset($relation['refClass'])) {
@@ -417 +420 @@
                     $relation['foreign'] = isset($relation['foreign']) ? $relation['foreign']:Doctrine::tableize($class) . '_id';
                 } else {
-                    $relation['local'] = isset($relation['local']) ? $relation['local']:Doctrine::tableize($class) . '_id';
+                    if ( ! isset($relation['local'])) {
+                        $classColumnName = Doctrine::tableize($relation['class']) . '_id';
+                        $aliasColumnName = Doctrine::tableize($relation['alias']) . '_id';
+                        
+                        if (isset($properties['columns'][$classColumnName])) {
+                            $local = $classColumnName;
+                        } else if (isset($properties['columns'][$aliasColumnName])) {
+                            $local = $aliasColumnName;
+                        } else {
+                            throw new Doctrine_Import_Exception('Could not guess local column name for relation: ' . $name);
+                        }
+                        
+                        $relation['local'] = $local;
+                    }
+                    
                     $relation['foreign'] = isset($relation['foreign']) ? $relation['foreign']:'id';
                 }
-            
-                $relation['alias'] = isset($relation['alias']) ? $relation['alias'] : $alias;
-                $relation['class'] = $class;
                 
                 if (isset($relation['refClass'])) {
@@ -470 +484 @@
         foreach($this->_relations as $className => $relations) {
             foreach ($relations AS $alias => $relation) {
+                if ((isset($relation['equal']) && $relation['equal']) || (isset($relation['auto_complete']) && $relation['auto_complete'] === false)) {
+                    continue;
+                }
+                
                 $newRelation = array();
                 $newRelation['foreign'] = $relation['local'];

branches/0.10/tests/schema.yml

@@ -19 +19 @@
       primary: true
       autoincrement: true
-    user_id:
+    schema_test_user_id:
       type: integer(4)
-    contact_id:
+    schema_test_contact_id:
       type: integer(4)
     first_name:
@@ -50 +50 @@
       primary: true
       autoincrement: true
-    contact_id:
+    schema_test_contact_id:
       type: integer(4)
     phone_number:
@@ -69 +69 @@
     type:
       type: string(255)
-  options:
-    subclasses: [SchemaTestInheritanceChild1]
 
 SchemaTestInheritanceChild1: