From 102f1068383847d638ee4118d42c2e969d4200ae Mon Sep 17 00:00:00 2001
From: gnat <gnat@625475ce-881a-0410-a577-b389adb331d8>
Date: Mon, 8 Oct 2007 16:49:15 +0000
Subject: [PATCH] fix class generation of yml schema fully defined m2m
 relationships.

---
 lib/Doctrine/Import/Schema.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/Doctrine/Import/Schema.php b/lib/Doctrine/Import/Schema.php
index b8b69620f..aeafed3d5 100644
--- a/lib/Doctrine/Import/Schema.php
+++ b/lib/Doctrine/Import/Schema.php
@@ -189,8 +189,8 @@ class Doctrine_Import_Schema
                     $relation['type'] = Doctrine_Relation::ONE;
                 }
 
-                if (isset($relation['ftype']) && $relation['ftype']) {
-                    $relation['ftype'] = $relation['ftype'] === 'one' ? Doctrine_Relation::ONE:Doctrine_Relation::MANY;
+                if (isset($relation['foreignType']) && $relation['foreignType']) {
+                    $relation['foreignType'] = $relation['foreignType'] === 'one' ? Doctrine_Relation::ONE:Doctrine_Relation::MANY;
                 }
                 
                 if(isset($relation['refClass']) && !empty($relation['refClass'])  && (!isset($array[$relation['refClass']]['relations']) || empty($array[$relation['refClass']]['relations']))) {
@@ -212,21 +212,29 @@ class Doctrine_Import_Schema
         // define both sides of the relationship
         foreach($this->relations as $className => $relations) {
             foreach ($relations AS $alias => $relation) {
-                if(isset($relation['ignore']) && $relation['ignore'] || isset($relation['refClass']))
+                if(isset($relation['ignore']) && $relation['ignore'] || isset($relation['refClass']) || isset($this->relations[$relation['class']]['relations'][$className])) {
                     continue;
+                }
                     
                 $newRelation = array();
                 $newRelation['foreign'] = $relation['local'];
                 $newRelation['local'] = $relation['foreign'];
                 $newRelation['class'] = $className;
                 $newRelation['alias'] = isset($relation['foreignAlias'])?$relation['foreignAlias']:$className;
-                if(isset($relation['ftype'])) {
-                    $newRelation['type']=$relation['ftype'];
+                if(isset($relation['foreignType'])) {
+                    $newRelation['type']=$relation['foreignType'];
                 } else {
                     $newRelation['type'] = $relation['type'] === Doctrine_Relation::ONE ? Doctrine_Relation::MANY:Doctrine_Relation::ONE; 
                 }
                 
-                $this->relations[$relation['class']][$className] = $newRelation;
+                if( isset($this->relations[$relation['class']]) && is_array($this->relations[$relation['class']]) ) {
+                    foreach($this->relations[$relation['class']] as $otherRelation) {
+                        if(isset($otherRelation['refClass']) && $otherRelation['refClass']==$className) // skip fully defined m2m relationships
+                            return;
+                    }
+                }
+                else
+                    $this->relations[$relation['class']][$className] = $newRelation;
             }
         }
     }