diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-19 13:32:15 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-19 13:32:15 -0300 |
| commit | 889f61efff779025dc2d8682dcbb018755f314bd (patch) | |
| tree | ce617d36a25c5b9722648a1ca7aad5f82d1fb677 /activerecord/lib/active_record | |
| parent | 4273554c5fcff8f49a2c81d3d5926f5c007f6e4c (diff) | |
| parent | 40708c3670df44659235aade62f31c6c2a9af223 (diff) | |
| download | rails-889f61efff779025dc2d8682dcbb018755f314bd.tar.gz rails-889f61efff779025dc2d8682dcbb018755f314bd.tar.bz2 rails-889f61efff779025dc2d8682dcbb018755f314bd.zip | |
Merge pull request #10798 from jcxplorer/fix-enable_extension-with-table_name_prefix
Fix migrations that use enable_extension with table_name_prefix/suffix
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/migration.rb
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index fc579e5c0f..8fe32bcb6c 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -640,7 +640,7 @@ module ActiveRecord say_with_time "#{method}(#{arg_list})" do unless @connection.respond_to? :revert - unless arguments.empty? || method == :execute + unless arguments.empty? || [:execute, :enable_extension, :disable_extension].include?(method) arguments[0] = proper_table_name(arguments.first, table_name_options) arguments[1] = proper_table_name(arguments.second, table_name_options) if method == :rename_table end |