diff options
| author | Marc-Andre Lafortune <github@marc-andre.ca> | 2012-12-22 12:10:40 -0500 |
|---|---|---|
| committer | Marc-Andre Lafortune <github@marc-andre.ca> | 2012-12-22 20:40:42 -0500 |
| commit | a4932d6a63e9883408537145e1f81477c27df3fc (patch) | |
| tree | 09dd205dd8131fb1e24fa62e0adfc7b8bfd73b9d /activerecord/lib/active_record/migration | |
| parent | f9da785d0b1b22317cfca25c15fb555e9016accb (diff) | |
| download | rails-a4932d6a63e9883408537145e1f81477c27df3fc.tar.gz rails-a4932d6a63e9883408537145e1f81477c27df3fc.tar.bz2 rails-a4932d6a63e9883408537145e1f81477c27df3fc.zip | |
Fixes for PR [#8267]
* Fix Migration#reversible by not using `transaction`.
* Adapt mysql adapter to updated api for remove_column
* Update test after aedcd683684d08eaf30623a4b48ce31a31426372
Diffstat (limited to 'activerecord/lib/active_record/migration')
| -rw-r--r-- | activerecord/lib/active_record/migration/command_recorder.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb index a6377185a8..79c55045ba 100644 --- a/activerecord/lib/active_record/migration/command_recorder.rb +++ b/activerecord/lib/active_record/migration/command_recorder.rb @@ -73,7 +73,7 @@ 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_default, :add_reference, :remove_reference, :transaction, - :drop_join_table, :drop_table, + :drop_join_table, :drop_table, :execute_block, :change_column, :execute, :remove_columns, # irreversible methods need to be here too ].each do |method| class_eval <<-EOV, __FILE__, __LINE__ + 1 @@ -94,6 +94,7 @@ module ActiveRecord module StraightReversions private { transaction: :transaction, + execute_block: :execute_block, create_table: :drop_table, create_join_table: :drop_join_table, add_column: :remove_column, |