aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-09-05 14:17:55 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-09-05 14:17:55 -0700
commit6d93f70c58ca1a1ee3d561421c1d2c12b4cb1cea (patch)
tree3d40eb5b2c475e990a88dd99bf967530ec2367ab
parent21750122308a38cd2eaf9b46aa1789966eb8abd9 (diff)
parent24674b344864298135f4f1cecca1214c6b9ddf42 (diff)
downloadrails-6d93f70c58ca1a1ee3d561421c1d2c12b4cb1cea.tar.gz
rails-6d93f70c58ca1a1ee3d561421c1d2c12b4cb1cea.tar.bz2
rails-6d93f70c58ca1a1ee3d561421c1d2c12b4cb1cea.zip
Merge pull request #2716 from jbbarth/fix_invert_rename_index
Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
-rw-r--r--activerecord/lib/active_record/migration/command_recorder.rb2
-rw-r--r--activerecord/test/cases/migration/command_recorder_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb
index 2eeff7e36f..ffee5a081a 100644
--- a/activerecord/lib/active_record/migration/command_recorder.rb
+++ b/activerecord/lib/active_record/migration/command_recorder.rb
@@ -71,7 +71,7 @@ module ActiveRecord
end
def invert_rename_index(args)
- [:rename_index, args.reverse]
+ [:rename_index, [args.first] + args.last(2).reverse]
end
def invert_rename_column(args)
diff --git a/activerecord/test/cases/migration/command_recorder_test.rb b/activerecord/test/cases/migration/command_recorder_test.rb
index 36007255fa..d108b456f0 100644
--- a/activerecord/test/cases/migration/command_recorder_test.rb
+++ b/activerecord/test/cases/migration/command_recorder_test.rb
@@ -104,9 +104,9 @@ module ActiveRecord
end
def test_invert_rename_index
- @recorder.record :rename_index, [:old, :new]
+ @recorder.record :rename_index, [:table, :old, :new]
rename = @recorder.inverse.first
- assert_equal [:rename_index, [:new, :old]], rename
+ assert_equal [:rename_index, [:table, :new, :old]], rename
end
def test_invert_add_timestamps