Updated TableOperation::apply() to remove non-existent columns from added indexes (#20)

Author: joshmcrae

src/Operation/TableOperation.php

@@ -299,29 +299,31 @@ public function apply(TableOperation $operation)
 
                 $indexes[$indexOperation->getName()] = $indexOperation;
             }
+        }
 
-            // Remove non-existent columns from indexes
-            foreach ($indexes as $name => $index) {
-                $indexColumns = [];
-                foreach ($index->getColumns() as $indexColumn) {
-                    foreach ($columns as $column) {
-                        if ($column->getName() === $indexColumn) {
-                            $indexColumns[] = $indexColumn;
-                        }
-                    }
-                }
+        // Remove non-existent columns from indexes
+        foreach ($indexes as $name => $index) {
+            $indexColumns = [];
 
-                if (empty($indexColumns)) {
-                    continue;
+            foreach ($index->getColumns() as $indexColumn) {
+                foreach ($columns as $column) {
+                    if ($column->getName() === $indexColumn) {
+                        $indexColumns[] = $indexColumn;
+                    }
                 }
+            }
 
-                $indexes[$name] = new IndexOperation(
-                    $index->getName(),
-                    $index->getOperation(),
-                    $indexColumns,
-                    $index->getOptions()
-                );
+            if ($index->getOperation() === IndexOperation::ADD && empty($indexColumns)) {
+                unset($indexes[$name]);
+                continue;
             }
+
+            $indexes[$name] = new IndexOperation(
+                $index->getName(),
+                $index->getOperation(),
+                $indexColumns,
+                $index->getOptions()
+            );
         }
 
         return new TableOperation(

tests/Operation/TableOperationTest.php

@@ -171,4 +171,22 @@ public function testReverseDrop()
 
         $this->assertEquals($create, $operation);
     }
+
+    public function testDropColumnReferencedByIndex()
+    {
+        $base = new TableOperation('users_roles', TableOperation::CREATE, [
+            new ColumnOperation('user_id', ColumnOperation::ADD, ['type' => 'uuid']),
+            new ColumnOperation('role', ColumnOperation::ADD, ['type' => 'string']),
+            new ColumnOperation('deleted_at', ColumnOperation::ADD, ['type' => 'datetime'])
+        ], [
+            new IndexOperation('user_role', IndexOperation::ADD, ['user_id', 'role', 'deleted_at'], [])
+        ]);
+
+        $alter = new TableOperation('users_roles', TableOperation::ALTER, [
+            new ColumnOperation('deleted_at', ColumnOperation::DROP, [])
+        ], []);
+
+        $operation = $base->apply($alter);
+        $this->assertNotContains('deleted_at', $operation->getIndexOperations()[0]->getColumns());
+    }
 }