Rename connection_klass to connection_class

Author: rafaelfranca

activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

@@ -33,7 +33,7 @@ class NullPool # :nodoc:
 
       attr_accessor :schema_cache
 
-      def connection_klass; end
+      def connection_class; end
       def checkin(_); end
       def remove(_); end
       def async_executor; end
@@ -105,8 +105,10 @@ class ConnectionPool
       include ConnectionAdapters::AbstractPool
 
       attr_accessor :automatic_reconnect, :checkout_timeout
-      attr_reader :db_config, :size, :reaper, :pool_config, :connection_klass, :async_executor, :role, :shard
+      attr_reader :db_config, :size, :reaper, :pool_config, :connection_class, :async_executor, :role, :shard
 
+      alias_method :connection_klass, :connection_class
+      deprecate :connection_klass
       delegate :schema_cache, :schema_cache=, to: :pool_config
 
       # Creates a new ConnectionPool object. +pool_config+ is a PoolConfig
@@ -120,7 +122,7 @@ def initialize(pool_config)
 
         @pool_config = pool_config
         @db_config = pool_config.db_config
-        @connection_klass = pool_config.connection_klass
+        @connection_class = pool_config.connection_class
         @role = pool_config.role
         @shard = pool_config.shard
 

activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -141,9 +141,9 @@ def use_metadata_table?
       def preventing_writes?
         return true if replica?
         return ActiveRecord::Base.connection_handler.prevent_writes if ActiveRecord.legacy_connection_handling
-        return false if connection_klass.nil?
+        return false if connection_class.nil?
 
-        connection_klass.current_preventing_writes
+        connection_class.current_preventing_writes
       end
 
       def migrations_paths # :nodoc:
@@ -220,8 +220,8 @@ def lease
         @owner = Thread.current
       end
 
-      def connection_klass # :nodoc:
-        @pool.connection_klass
+      def connection_class # :nodoc:
+        @pool.connection_class
       end
 
       # The role (ie :writing) for the current connection. In a

activerecord/lib/active_record/connection_adapters/pool_config.rb

@@ -5,7 +5,7 @@ module ConnectionAdapters
     class PoolConfig # :nodoc:
       include Mutex_m
 
-      attr_reader :db_config, :connection_klass, :role, :shard
+      attr_reader :db_config, :connection_class, :role, :shard
       attr_accessor :schema_cache
 
       INSTANCES = ObjectSpace::WeakMap.new
@@ -17,9 +17,9 @@ def discard_pools!
         end
       end
 
-      def initialize(connection_klass, db_config, role, shard)
+      def initialize(connection_class, db_config, role, shard)
         super()
-        @connection_klass = connection_klass
+        @connection_class = connection_class
         @db_config = db_config
         @role = role
         @shard = shard
@@ -28,10 +28,10 @@ def initialize(connection_klass, db_config, role, shard)
       end
 
       def connection_specification_name
-        if connection_klass.primary_class?
+        if connection_class.primary_class?
           "ActiveRecord::Base"
         else
-          connection_klass.name
+          connection_class.name
         end
       end