From ca775fdc9977f459beafced8cdc69d5eb628be89 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 9 Jun 2007 21:54:08 +0000
Subject: [PATCH] fixed many-to-many column guessing

---
 lib/Doctrine/Relation/Parser.php | 43 ++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/lib/Doctrine/Relation/Parser.php b/lib/Doctrine/Relation/Parser.php
index 443c12c95..1b0c842ba 100644
--- a/lib/Doctrine/Relation/Parser.php
+++ b/lib/Doctrine/Relation/Parser.php
@@ -191,22 +191,39 @@ class Doctrine_Relation_Parser
         $def['table']    = $conn->getTable($def['class']);
         $def['refTable'] = $conn->getTable($def['refClass']);
 
-        if ( ! isset($def['foreign'])) {
-            // foreign key not set
-            // try to guess the foreign key
+        $id = $def['refTable']->getIdentifier();
 
-            $columns = $this->getIdentifiers($def['table']);
+        if (count($id) > 1) {
+            if ( ! isset($def['foreign'])) {
+                // foreign key not set
+                // try to guess the foreign key
+    
+                $def['foreign'] = ($def['local'] === $id[0]) ? $id[1] : $id[0];
+            }
+            if ( ! isset($def['local'])) {
+                // foreign key not set
+                // try to guess the foreign key
 
-            $def['foreign'] = $columns;
+                $def['local'] = ($def['foreign'] === $id[0]) ? $id[1] : $id[0];
+            }
+        } else {
+
+            if ( ! isset($def['foreign'])) {
+                // foreign key not set
+                // try to guess the foreign key
+    
+                $columns = $this->getIdentifiers($def['table']);
+    
+                $def['foreign'] = $columns;
+            }
+            if ( ! isset($def['local'])) {
+                // local key not set
+                // try to guess the local key
+                $columns = $this->getIdentifiers($this->_table);
+    
+                $def['local'] = $columns;
+            }
         }
-        if ( ! isset($def['local'])) {
-            // local key not set
-            // try to guess the local key
-            $columns = $this->getIdentifiers($this->_table);
-
-            $def['local'] = $columns;
-        } 
-
         return $def;
     }
     /**