diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-26 14:27:43 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-26 14:27:43 -0300 |
commit | b2a2594846c58f1d6c0c16419602a75106d103f0 (patch) | |
tree | bcc37af3b43646dec85d3dc6265c6e35c0031792 /activerecord | |
parent | e47e8e915e733177fe1dee2c67bef1724bbba553 (diff) | |
parent | 1591c3459844d6163fab0698c17f74aabd914ae1 (diff) | |
download | rails-b2a2594846c58f1d6c0c16419602a75106d103f0.tar.gz rails-b2a2594846c58f1d6c0c16419602a75106d103f0.tar.bz2 rails-b2a2594846c58f1d6c0c16419602a75106d103f0.zip |
Merge pull request #21336 from yui-knk/refactor/to_use_getter
Use `ActiveRecord::Migration#connection` instead of `@connection`
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 923dc1799a..4901f9dafd 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -475,13 +475,13 @@ module ActiveRecord def revert(*migration_classes) run(*migration_classes.reverse, revert: true) unless migration_classes.empty? if block_given? - if @connection.respond_to? :revert - @connection.revert { yield } + if connection.respond_to? :revert + connection.revert { yield } else - recorder = CommandRecorder.new(@connection) + recorder = CommandRecorder.new(connection) @connection = recorder suppress_messages do - @connection.revert { yield } + connection.revert { yield } end @connection = recorder.delegate recorder.commands.each do |cmd, args, block| @@ -492,7 +492,7 @@ module ActiveRecord end def reverting? - @connection.respond_to?(:reverting) && @connection.reverting + connection.respond_to?(:reverting) && connection.reverting end class ReversibleBlockHelper < Struct.new(:reverting) # :nodoc: @@ -549,7 +549,7 @@ module ActiveRecord revert { run(*migration_classes, direction: dir, revert: true) } else migration_classes.each do |migration_class| - migration_class.new.exec_migration(@connection, dir) + migration_class.new.exec_migration(connection, dir) end end end @@ -641,7 +641,7 @@ module ActiveRecord arg_list = arguments.map(&:inspect) * ', ' say_with_time "#{method}(#{arg_list})" do - unless @connection.respond_to? :revert + unless connection.respond_to? :revert unless arguments.empty? || [:execute, :enable_extension, :disable_extension].include?(method) arguments[0] = proper_table_name(arguments.first, table_name_options) if [:rename_table, :add_foreign_key].include?(method) || |