diff options
author | Marc-Andre Lafortune <github@marc-andre.ca> | 2012-12-19 01:44:42 -0500 |
---|---|---|
committer | Marc-Andre Lafortune <github@marc-andre.ca> | 2012-12-21 13:54:53 -0500 |
commit | 06c7ba881d008be82d62656f297d6a3c09a889c5 (patch) | |
tree | 4ba289448374c19fd06126fcd430f9606e836a97 /activerecord | |
parent | e43e8e268f0522f9f11f4eacae1d04afca768c9b (diff) | |
download | rails-06c7ba881d008be82d62656f297d6a3c09a889c5.tar.gz rails-06c7ba881d008be82d62656f297d6a3c09a889c5.tar.bz2 rails-06c7ba881d008be82d62656f297d6a3c09a889c5.zip |
Make execute, change_column and remove_columns methods actually irreversible
[#8267]
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/migration/command_recorder.rb | 3 | ||||
-rw-r--r-- | activerecord/test/cases/migration/command_recorder_test.rb | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb index f738c909bc..13ce28330a 100644 --- a/activerecord/lib/active_record/migration/command_recorder.rb +++ b/activerecord/lib/active_record/migration/command_recorder.rb @@ -73,7 +73,8 @@ module ActiveRecord [:create_table, :create_join_table, :rename_table, :add_column, :remove_column, :rename_index, :rename_column, :add_index, :remove_index, :add_timestamps, :remove_timestamps, :change_column, :change_column_default, :add_reference, :remove_reference, :transaction, - :drop_join_table, :drop_table, :remove_columns, :remove_index, + :drop_join_table, :drop_table, :remove_index, + :change_column, :execute, :remove_columns, # irreversible methods need to be here too ].each do |method| class_eval <<-EOV, __FILE__, __LINE__ + 1 def #{method}(*args, &block) # def create_table(*args, &block) diff --git a/activerecord/test/cases/migration/command_recorder_test.rb b/activerecord/test/cases/migration/command_recorder_test.rb index b406beba06..2cad8a6d96 100644 --- a/activerecord/test/cases/migration/command_recorder_test.rb +++ b/activerecord/test/cases/migration/command_recorder_test.rb @@ -34,12 +34,18 @@ module ActiveRecord assert_equal 'bar', recorder.foo end - def test_unknown_commands_raise_exception_if_they_cannot_delegate + def test_inverse_of_raise_exception_on_unknown_commands assert_raises(ActiveRecord::IrreversibleMigration) do @recorder.inverse_of :execute, ['some sql'] end end + def test_irreversible_commands_raise_exception + assert_raises(ActiveRecord::IrreversibleMigration) do + @recorder.revert{ @recorder.execute 'some sql' } + end + end + def test_record @recorder.record :create_table, [:system_settings] assert_equal 1, @recorder.commands.length |