Fixed issue with the diff command when new tables are also included i…

…n the changed tables list.
camcima · Apr 11, 2016 · ab8e44e · ab8e44e
1 parent 7924dca
commit ab8e44e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Differ.php b/src/Differ.php
@@ -101,7 +101,9 @@ private function diffColumns(ChangedTable $changedTable)
      */
     private function addChangedColumn(ChangedTable $changedTable, Column $column)
     {
-        $changedTable->addChangedColumn($column);
+        if (!$changedTable->hasNewColumn($column->getName())) {
+            $changedTable->addChangedColumn($column);
+        }
 
         if (!$column->getNextColumn()) {
             return;

diff --git a/src/Model/ChangedTable.php b/src/Model/ChangedTable.php
@@ -117,6 +117,20 @@ public function getNewColumns()
     public function addNewColumn(Column $newColumn)
     {
         $this->newColumns[$newColumn->getName()] = $newColumn;
+
+        if (isset($this->changedColumns[$newColumn->getName()])) {
+            unset($this->changedColumns[$newColumn->getName()]);
+        }
+    }
+
+    /**
+     * @param $columnName
+     *
+     * @return bool
+     */
+    public function hasNewColumn($columnName)
+    {
+        return isset($this->newColumns[$columnName]);
     }
 
     /**