Merge pull request #1229 from workmad3/master

Fix for Issue #1205
rails · May 27, 2011 · 2a9b3ab · 2a9b3ab
2 parents 985ace4 + 06436b2
commit 2a9b3ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb
@@ -79,8 +79,10 @@ def invert_rename_column(args)
       end
 
       def invert_add_index(args)
-        table, columns, _ = *args
-        [:remove_index, [table, {:column => columns}]]
+        table, columns, options = *args
+        index_name = options.try(:[], :name)
+        options_hash =  index_name ? {:name => index_name} : {:column => columns}
+        [:remove_index, [table, options_hash]]
       end
 
       def invert_remove_timestamps(args)

diff --git a/activerecord/test/cases/migration/command_recorder_test.rb b/activerecord/test/cases/migration/command_recorder_test.rb
@@ -86,6 +86,18 @@ def test_invert_add_index
         assert_equal [:remove_index, [:table, {:column => [:one, :two]}]], remove
       end
 
+      def test_invert_add_index_with_name
+          @recorder.record :add_index, [:table, [:one, :two], {:name => "new_index"}]
+          remove = @recorder.inverse.first
+          assert_equal [:remove_index, [:table, {:name => "new_index"}]], remove
+      end
+
+      def test_invert_add_index_with_no_options
+        @recorder.record :add_index, [:table, [:one, :two]]
+        remove = @recorder.inverse.first
+        assert_equal [:remove_index, [:table, {:column => [:one, :two]}]], remove
+      end
+
       def test_invert_rename_index
         @recorder.record :rename_index, [:old, :new]
         rename = @recorder.inverse.first