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.rb | |
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.rb')
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 273af32237..67339c05e5 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -477,7 +477,7 @@ module ActiveRecord # end def reversible helper = ReversibleBlockHelper.new(reverting?) - transaction{ yield helper } + execute_block{ yield helper } end # Runs the given migration classes. @@ -639,6 +639,15 @@ module ActiveRecord "%.3d" % number end end + + private + def execute_block + if connection.respond_to? :execute_block + super # use normal delegation to record the block + else + yield + end + end end # MigrationProxy is used to defer loading of the actual migration classes |