fixed bug on schema comparitor, prevent multiple rename candidates for the same original field

9848b188 · Lee Davis · Benjamin Eberlei · c9cdbb0a · 9848b188
Commit 9848b188 authored Oct 04, 2012 by Lee Davis Committed by Benjamin Eberlei May 01, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Comparator.php lib/Doctrine/DBAL/Schema/Comparator.php +7 -4

No files found.
--- a/lib/Doctrine/DBAL/Schema/Comparator.php
+++ b/lib/Doctrine/DBAL/Schema/Comparator.php
@@ -294,10 +294,13 @@ class Comparator
                list($removedColumn, $addedColumn) = $candidateColumns[0];
                $removedColumnName = strtolower($removedColumn->getName());
                $addedColumnName = strtolower($addedColumn->getName());
-
-                $tableDifferences->renamedColumns[$removedColumnName] = $addedColumn;
-                unset($tableDifferences->addedColumns[$addedColumnName]);
-                unset($tableDifferences->removedColumns[$removedColumnName]);
+                
+                if (!isset($tableDifferences->renamedColumns[$removedColumnName]))
+                {
+                    $tableDifferences->renamedColumns[$removedColumnName] = $addedColumn;
+                    unset($tableDifferences->addedColumns[$addedColumnName]);
+                    unset($tableDifferences->removedColumns[$removedColumnName]);
+                }
            }
        }
    }