Rename the raw connection ivar to @raw_connection

This is unfortunately going to force a change into all external adapter
subclasses, but I'm going to be making other changes too, so it's not
the worst of them... and it's just so confusing at the moment to have
"@connection" sometimes mean the AR adapter and sometimes the inner
connection, depending on exactly which class we're in.

Author: matthewd

activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -92,7 +92,7 @@ def self.quoted_table_names # :nodoc:
       def initialize(connection, logger = nil, config = {}) # :nodoc:
         super()
 
-        @connection          = connection
+        @raw_connection      = connection
         @owner               = nil
         @instrumenter        = ActiveSupport::Notifications.instrumenter
         @logger              = logger
@@ -569,7 +569,7 @@ def disconnect!
       def discard!
         # This should be overridden by concrete adapters.
         #
-        # Prevent @connection's finalizer from touching the socket, or
+        # Prevent @raw_connection's finalizer from touching the socket, or
         # otherwise communicating with its server, when it is collected.
         if schema_cache.connection == self
           schema_cache.connection = nil
@@ -625,7 +625,7 @@ def verify!
       # PostgreSQL's lo_* methods.
       def raw_connection
         disable_lazy_transactions!
-        @connection
+        @raw_connection
       end
 
       def default_uniqueness_comparison(attribute, value) # :nodoc:

activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -639,7 +639,7 @@ def raw_execute(sql, name, async: false)
 
           log(sql, name, async: async) do
             ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-              @connection.query(sql)
+              @raw_connection.query(sql)
             end
           end
         end

activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb

@@ -11,7 +11,7 @@ def select_all(*, **) # :nodoc:
           else
             super
           end
-          @connection.abandon_results!
+          @raw_connection.abandon_results!
           result
         end
 
@@ -70,7 +70,7 @@ def exec_query(sql, name = "SQL", binds = [], prepare: false, async: false) # :n
         def exec_delete(sql, name = nil, binds = []) # :nodoc:
           if without_prepared_statement?(binds)
             @lock.synchronize do
-              execute_and_free(sql, name) { @connection.affected_rows }
+              execute_and_free(sql, name) { @raw_connection.affected_rows }
             end
           else
             exec_stmt_and_free(sql, name, binds) { |stmt| stmt.affected_rows }
@@ -91,7 +91,7 @@ def high_precision_current_timestamp
           def raw_execute(sql, name, async: false)
             # make sure we carry over any changes to ActiveRecord.default_timezone that have been
             # made since we established the connection
-            @connection.query_options[:database_timezone] = default_timezone
+            @raw_connection.query_options[:database_timezone] = default_timezone
 
             super
           end
@@ -100,7 +100,7 @@ def execute_batch(statements, name = nil)
             statements = statements.map { |sql| transform_query(sql) }
             combine_multi_statements(statements).each do |statement|
               raw_execute(statement, name)
-              @connection.abandon_results!
+              @raw_connection.abandon_results!
             end
           end
 
@@ -109,7 +109,7 @@ def default_insert_value(column)
           end
 
           def last_inserted_id(result)
-            @connection.last_id
+            @raw_connection.last_id
           end
 
           def multi_statements_enabled?
@@ -126,13 +126,13 @@ def with_multi_statements
             multi_statements_was = multi_statements_enabled?
 
             unless multi_statements_was
-              @connection.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)
+              @raw_connection.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)
             end
 
             yield
           ensure
             unless multi_statements_was
-              @connection.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)
+              @raw_connection.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)
             end
           end
 
@@ -171,15 +171,15 @@ def exec_stmt_and_free(sql, name, binds, cache_stmt: false, async: false)
 
             # make sure we carry over any changes to ActiveRecord.default_timezone that have been
             # made since we established the connection
-            @connection.query_options[:database_timezone] = default_timezone
+            @raw_connection.query_options[:database_timezone] = default_timezone
 
             type_casted_binds = type_casted_binds(binds)
 
             log(sql, name, binds, type_casted_binds, async: async) do
               if cache_stmt
-                stmt = @statements[sql] ||= @connection.prepare(sql)
+                stmt = @statements[sql] ||= @raw_connection.prepare(sql)
               else
-                stmt = @connection.prepare(sql)
+                stmt = @raw_connection.prepare(sql)
               end
 
               begin

activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -111,7 +111,7 @@ def error_number(exception)
       #++
 
       def quote_string(string)
-        @connection.escape(string)
+        @raw_connection.escape(string)
       rescue Mysql2::Error => error
         raise translate_exception(error, message: error.message, sql: "<escape>", binds: [])
       end
@@ -121,7 +121,7 @@ def quote_string(string)
       #++
 
       def active?
-        @connection.ping
+        @raw_connection.ping
       end
 
       def reconnect!
@@ -135,13 +135,13 @@ def reconnect!
       # Otherwise, this method does nothing.
       def disconnect!
         super
-        @connection.close
+        @raw_connection.close
       end
 
       def discard! # :nodoc:
         super
-        @connection.automatic_close = false
-        @connection = nil
+        @raw_connection.automatic_close = false
+        @raw_connection = nil
       end
 
       private
@@ -154,12 +154,12 @@ def check_prepared_statements_deprecation(config)
         end
 
         def connect
-          @connection = self.class.new_client(@config)
+          @raw_connection = self.class.new_client(@config)
           configure_connection
         end
 
         def configure_connection
-          @connection.query_options[:as] = :array
+          @raw_connection.query_options[:as] = :array
           super
         end
 
@@ -168,7 +168,7 @@ def full_version
         end
 
         def get_full_version
-          @connection.server_info[:version]
+          @raw_connection.server_info[:version]
         end
 
         def translate_exception(exception, message:, sql:, binds:)

activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb

@@ -15,7 +15,7 @@ def query(sql, name = nil) # :nodoc:
 
           log(sql, name) do
             ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-              @connection.async_exec(sql).map_types!(@type_map_for_results).values
+              @raw_connection.async_exec(sql).map_types!(@type_map_for_results).values
             end
           end
         end
@@ -43,7 +43,7 @@ def execute(sql, name = nil)
 
           log(sql, name) do
             ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-              @connection.async_exec(sql)
+              @raw_connection.async_exec(sql)
             end
           end
         end
@@ -120,8 +120,8 @@ def commit_db_transaction # :nodoc:
 
         # Aborts a transaction.
         def exec_rollback_db_transaction # :nodoc:
-          @connection.cancel unless @connection.transaction_status == PG::PQTRANS_IDLE
-          @connection.block
+          @raw_connection.cancel unless @raw_connection.transaction_status == PG::PQTRANS_IDLE
+          @raw_connection.block
           execute("ROLLBACK", "TRANSACTION")
         end
 

activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb

@@ -6,14 +6,14 @@ module PostgreSQL
       module Quoting
         # Escapes binary strings for bytea input to the database.
         def escape_bytea(value)
-          @connection.escape_bytea(value) if value
+          @raw_connection.escape_bytea(value) if value
         end
 
         # Unescapes bytea output from a database to the binary string it represents.
         # NOTE: This is NOT an inverse of escape_bytea! This is only to be used
         # on escaped binary output from database drive.
         def unescape_bytea(value)
-          @connection.unescape_bytea(value) if value
+          @raw_connection.unescape_bytea(value) if value
         end
 
         def quote(value) # :nodoc:
@@ -43,7 +43,7 @@ def quote(value) # :nodoc:
 
         # Quotes strings for use in SQL input.
         def quote_string(s) # :nodoc:
-          @connection.escape(s)
+          @raw_connection.escape(s)
         end
 
         # Checks the following cases:

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -256,7 +256,7 @@ def index_algorithms
       class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
         def initialize(connection, max)
           super(max)
-          @connection = connection
+          @raw_connection = connection
           @counter = 0
         end
 
@@ -266,12 +266,12 @@ def next_key
 
         private
           def dealloc(key)
-            @connection.query "DEALLOCATE #{key}" if connection_active?
+            @raw_connection.query "DEALLOCATE #{key}" if connection_active?
           rescue PG::Error
           end
 
           def connection_active?
-            @connection.status == PG::CONNECTION_OK
+            @raw_connection.status == PG::CONNECTION_OK
           rescue PG::Error
             false
           end
@@ -306,7 +306,7 @@ def self.database_exists?(config)
       # Is this connection alive and ready for queries?
       def active?
         @lock.synchronize do
-          @connection.query ";"
+          @raw_connection.query ";"
         end
         true
       rescue PG::Error
@@ -321,7 +321,7 @@ def reload_type_map # :nodoc:
       # Close then reopen the connection.
       def reconnect!
         @lock.synchronize do
-          @connection.reset
+          @raw_connection.reset
           configure_connection
           reload_type_map
           super
@@ -333,10 +333,10 @@ def reconnect!
       def reset!
         @lock.synchronize do
           reset_transaction
-          unless @connection.transaction_status == ::PG::PQTRANS_IDLE
-            @connection.query "ROLLBACK"
+          unless @raw_connection.transaction_status == ::PG::PQTRANS_IDLE
+            @raw_connection.query "ROLLBACK"
           end
-          @connection.query "DISCARD ALL"
+          @raw_connection.query "DISCARD ALL"
           clear_cache!(new_connection: true)
           configure_connection
         end
@@ -347,14 +347,14 @@ def reset!
       def disconnect!
         @lock.synchronize do
           super
-          @connection.close rescue nil
+          @raw_connection.close rescue nil
         end
       end
 
       def discard! # :nodoc:
         super
-        @connection.socket_io.reopen(IO::NULL) rescue nil
-        @connection = nil
+        @raw_connection.socket_io.reopen(IO::NULL) rescue nil
+        @raw_connection = nil
       end
 
       def native_database_types # :nodoc:
@@ -503,7 +503,7 @@ def use_insert_returning?
 
       # Returns the version of the connected PostgreSQL server.
       def get_database_version # :nodoc:
-        @connection.server_version
+        @raw_connection.server_version
       end
       alias :postgresql_version :database_version
 
@@ -765,7 +765,7 @@ def exec_no_cache(sql, name, binds, async: false)
           type_casted_binds = type_casted_binds(binds)
           log(sql, name, binds, type_casted_binds, async: async) do
             ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-              @connection.exec_params(sql, type_casted_binds)
+              @raw_connection.exec_params(sql, type_casted_binds)
             end
           end
         end
@@ -779,7 +779,7 @@ def exec_cache(sql, name, binds, async: false)
 
           log(sql, name, binds, type_casted_binds, stmt_key, async: async) do
             ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-              @connection.exec_prepared(stmt_key, type_casted_binds)
+              @raw_connection.exec_prepared(stmt_key, type_casted_binds)
             end
           end
         rescue ActiveRecord::StatementInvalid => e
@@ -833,12 +833,12 @@ def prepare_statement(sql, binds)
             unless @statements.key? sql_key
               nextkey = @statements.next_key
               begin
-                @connection.prepare nextkey, sql
+                @raw_connection.prepare nextkey, sql
               rescue => e
                 raise translate_exception_class(e, sql, binds)
               end
               # Clear the queue
-              @connection.get_last_result
+              @raw_connection.get_last_result
               @statements[sql_key] = nextkey
             end
             @statements[sql_key]
@@ -848,7 +848,7 @@ def prepare_statement(sql, binds)
         # Connects to a PostgreSQL server and sets up the adapter depending on the
         # connected server's characteristics.
         def connect
-          @connection = self.class.new_client(@connection_parameters)
+          @raw_connection = self.class.new_client(@connection_parameters)
           configure_connection
           add_pg_encoders
           add_pg_decoders
@@ -858,7 +858,7 @@ def connect
         # This is called by #connect and should not be called manually.
         def configure_connection
           if @config[:encoding]
-            @connection.set_client_encoding(@config[:encoding])
+            @raw_connection.set_client_encoding(@config[:encoding])
           end
           self.client_min_messages = @config[:min_messages] || "warning"
           self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
@@ -937,7 +937,7 @@ def arel_visitor
         end
 
         def build_statement_pool
-          StatementPool.new(@connection, self.class.type_cast_config_to_integer(@config[:statement_limit]))
+          StatementPool.new(@raw_connection, self.class.type_cast_config_to_integer(@config[:statement_limit]))
         end
 
         def can_perform_case_insensitive_comparison_for?(column)
@@ -967,7 +967,7 @@ def add_pg_encoders
           map[Integer] = PG::TextEncoder::Integer.new
           map[TrueClass] = PG::TextEncoder::Boolean.new
           map[FalseClass] = PG::TextEncoder::Boolean.new
-          @connection.type_map_for_queries = map
+          @raw_connection.type_map_for_queries = map
         end
 
         def update_typemap_for_default_timezone
@@ -977,7 +977,7 @@ def update_typemap_for_default_timezone
               PG::TextDecoder::TimestampWithoutTimeZone
 
             @timestamp_decoder = decoder_class.new(@timestamp_decoder.to_h)
-            @connection.type_map_for_results.add_coder(@timestamp_decoder)
+            @raw_connection.type_map_for_results.add_coder(@timestamp_decoder)
 
             @mapped_default_timezone = default_timezone
 
@@ -1016,7 +1016,7 @@ def add_pg_decoders
 
           map = PG::TypeMapByOid.new
           coders.each { |coder| map.add_coder(coder) }
-          @connection.type_map_for_results = map
+          @raw_connection.type_map_for_results = map
 
           @type_map_for_results = PG::TypeMapByOid.new
           @type_map_for_results.default_type_map = map