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

1947a85e · Lee Davis · 804bd86e · 1947a85e
Commit 1947a85e authored Oct 04, 2012 by Lee Davis
Show 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
@@ -283,12 +283,15 @@ class Comparator
                $removedColumnName = strtolower($removedColumn->getName());
                $addedColumnName = strtolower($addedColumn->getName());
                
+                if (!isset($tableDifferences->renamedColumns[$removedColumnName]))
+                {
                    $tableDifferences->renamedColumns[$removedColumnName] = $addedColumn;
                    unset($tableDifferences->addedColumns[$addedColumnName]);
                    unset($tableDifferences->removedColumns[$removedColumnName]);
                }
            }
        }
+    }

    /**
     * @param ForeignKeyConstraint $key1