cleanup, cleanup, everybody everywhere

Author: skipkayhil

activerecord/lib/active_record/database_configurations/hash_config.rb

@@ -195,10 +195,7 @@ def use_metadata_table? # :nodoc:
         configuration_hash.fetch(:use_metadata_table, true)
       end
 
-      # The schema context key groups connections that share a schema shape.
-      # Multiple pools (read replicas, shards) can share the same key, meaning
-      # they share cached schema information. Defaults to "default".
-      def schema_context_key # :nodoc:
+      def schema_context # :nodoc:
         configuration_hash.fetch(:schema_context, "default").to_s
       end
 

activerecord/lib/active_record/model_schema.rb

@@ -200,23 +200,17 @@ def self.derive_join_table_name(first_table, second_table) # :nodoc:
     end
 
     module ClassMethods
-      # Returns the current schema context key from the connection configuration.
-      # Defaults to "default" if no connection is available or no context is configured.
-      def current_schema_context_key # :nodoc:
-        connection_db_config.schema_context_key
+      def current_schema_context # :nodoc:
+        connection_db_config.schema_context
       rescue ConnectionNotDefined
         "default"
       end
 
-      # Returns the Schema instance for the current schema context.
-      # Each context has its own Schema instance that caches schema-dependent state.
       def model_schema # :nodoc:
-        context_key = current_schema_context_key
-        @model_schemas ||= {}
-        @model_schemas[context_key] ||= Schema.new(self, context_key)
+        context_key = current_schema_context
+        model_schemas[context_key] ||= Schema.new(self, context_key)
       end
 
-      # Returns all Schema instances for this model (across all contexts).
       def model_schemas # :nodoc:
         @model_schemas ||= {}
       end
@@ -575,9 +569,9 @@ def load_schema
 
           model_schema.load_schema!
 
-          unless @model_schema_loaded
+          unless @any_schema_loaded
             load_schema!
-            @model_schema_loaded = true
+            @any_schema_loaded = true
           end
         rescue
           reload_schema_from_cache # If the schema loading failed half way through, we must reset the state.
@@ -591,7 +585,7 @@ def initialize_load_schema_monitor
         end
 
         def reload_schema_from_cache(recursive = true)
-          @model_schema_loaded = false
+          @any_schema_loaded = false
           @attribute_names = nil
 
           # Reset all Schema instances
@@ -608,15 +602,15 @@ def reload_schema_from_cache(recursive = true)
         def inherited(child_class)
           super
           child_class.initialize_load_schema_monitor
+          child_class.reload_schema_from_cache(false)
           child_class.class_eval do
-            @model_schemas = {}
             @ignored_columns = nil
             @only_columns = nil
           end
         end
 
         def schema_loaded?
-          model_schema.instance_variable_get(:@schema_loaded)
+          model_schema.schema_loaded?
         end
 
         def load_schema!

activerecord/lib/active_record/model_schema/schema.rb

@@ -160,7 +160,7 @@ def load_schema!
           raise ActiveRecord::TableNotSpecified, "#{model_class} has no table configured. Set one with #{model_class}.table_name="
         end
 
-        columns_hash = schema_cache.columns_hash(table_name)
+        columns_hash = model_class.connection_pool.schema_cache.columns_hash(table_name)
         if model_class.only_columns.present?
           columns_hash = columns_hash.slice(*model_class.only_columns)
         elsif model_class.ignored_columns.present?
@@ -174,18 +174,9 @@ def load_schema!
         @schema_loaded = true
       end
 
-      private
-        def schema_cache
-          connection_pool.schema_cache
-        end
-
-        def connection_pool
-          model_class.connection_pool
-        end
-
-        def connection
-          model_class.lease_connection
-        end
+      def schema_loaded?
+        @schema_loaded
+      end
     end
   end
 end