diff options
author | Arthur Nogueira Neves <github@arthurnn.com> | 2016-09-12 14:56:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-12 14:56:21 -0400 |
commit | e23cbdda632e3e7ef228cfe8b12832f1bad1c706 (patch) | |
tree | 9a9af08266c8b27172d38b31bc76daf2c7ff7931 /activerecord/lib/active_record | |
parent | 3dbb371445fa5d9e7477159e0d3079213633d5f9 (diff) | |
parent | 01adc45672672459c98880babb39ff5b357e1296 (diff) | |
download | rails-e23cbdda632e3e7ef228cfe8b12832f1bad1c706.tar.gz rails-e23cbdda632e3e7ef228cfe8b12832f1bad1c706.tar.bz2 rails-e23cbdda632e3e7ef228cfe8b12832f1bad1c706.zip |
Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connection
activerecord/mysql2: Avoid setting @connection to nil, just close it
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb | 16 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb index c8238eb266..56800f7590 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb @@ -24,11 +24,9 @@ module ActiveRecord # Executes the SQL statement in the context of this connection. def execute(sql, name = nil) - if @connection - # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been - # made since we established the connection - @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone - end + # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been + # made since we established the connection + @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone super end @@ -71,11 +69,9 @@ module ActiveRecord end def exec_stmt_and_free(sql, name, binds, cache_stmt: false) - if @connection - # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been - # made since we established the connection - @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone - end + # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been + # made since we established the connection + @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone type_casted_binds = type_casted_binds(binds) diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 0130b4ef62..a3e2c913c5 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -90,7 +90,6 @@ module ActiveRecord #++ def active? - return false unless @connection @connection.ping end @@ -105,10 +104,7 @@ module ActiveRecord # Otherwise, this method does nothing. def disconnect! super - unless @connection.nil? - @connection.close - @connection = nil - end + @connection.close end private |