Delay the exclusion of the configs to the last minute

The framework still rely on the configuration object being modified
in initializers, so we need to delay the exclusion to the last minute.

Author: rafaelfranca

actionpack/lib/action_controller/railtie.rb

@@ -57,19 +57,19 @@ class Railtie < Rails::Railtie # :nodoc:
       options.asset_host        ||= app.config.asset_host
       options.relative_url_root ||= app.config.relative_url_root
 
-      # Configs used in other initializers
-      options = options.except(
-        :log_query_tags_around_actions,
-        :permit_all_parameters,
-        :action_on_unpermitted_parameters,
-        :always_permitted_parameters
-      )
-
       ActiveSupport.on_load(:action_controller) do
         include app.routes.mounted_helpers
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
         extend ::ActionController::Railties::Helpers
 
+        # Configs used in other initializers
+        options = options.except(
+          :log_query_tags_around_actions,
+          :permit_all_parameters,
+          :action_on_unpermitted_parameters,
+          :always_permitted_parameters
+        )
+
         options.each do |k, v|
           k = "#{k}="
           if respond_to?(k)

activejob/lib/active_job/railtie.rb

@@ -25,13 +25,13 @@ class Railtie < Rails::Railtie # :nodoc:
       options = app.config.active_job
       options.queue_adapter ||= :async
 
-      # Configs used in other initializers
-      options = options.except(
-        :log_query_tags_around_perform,
-        :custom_serializers
-      )
-
       ActiveSupport.on_load(:active_job) do
+        # Configs used in other initializers
+        options = options.except(
+          :log_query_tags_around_perform,
+          :custom_serializers
+        )
+
         options.each do  |k, v|
           k = "#{k}="
           send(k, v) if respond_to? k

activerecord/lib/active_record/railtie.rb

@@ -87,17 +87,17 @@ class Railtie < Rails::Railtie # :nodoc:
     end
 
     initializer "active_record.migration_error" do |app|
-      if config.active_record.delete(:migration_error) == :page_load
+      if config.active_record.migration_error == :page_load
         config.app_middleware.insert_after ::ActionDispatch::Callbacks,
           ActiveRecord::Migration::CheckPending,
           file_watcher: app.config.file_watcher
       end
     end
 
     initializer "active_record.database_selector" do
-      if options = config.active_record.delete(:database_selector)
-        resolver = config.active_record.delete(:database_resolver)
-        operations = config.active_record.delete(:database_resolver_context)
+      if options = config.active_record.database_selector
+        resolver = config.active_record.database_resolver
+        operations = config.active_record.database_resolver_context
         config.app_middleware.use ActiveRecord::Middleware::DatabaseSelector, resolver, operations, options
       end
     end
@@ -128,9 +128,9 @@ class Railtie < Rails::Railtie # :nodoc:
     end
 
     initializer "active_record.check_schema_cache_dump" do
-      check_schema_cache_dump_version = config.active_record.delete(:check_schema_cache_dump_version)
+      check_schema_cache_dump_version = config.active_record.check_schema_cache_dump_version
 
-      if config.active_record.delete(:use_schema_cache_dump)
+      if config.active_record.use_schema_cache_dump
         config.after_initialize do |app|
           ActiveSupport.on_load(:active_record) do
             db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first
@@ -205,15 +205,15 @@ class Railtie < Rails::Railtie # :nodoc:
     SQLITE3_PRODUCTION_WARN = "You are running SQLite in production, this is generally not recommended."\
       " You can disable this warning by setting \"config.active_record.sqlite3_production_warning=false\"."
     initializer "active_record.sqlite3_production_warning" do
-      if config.active_record.delete(:sqlite3_production_warning) && Rails.env.production?
+      if config.active_record.sqlite3_production_warning && Rails.env.production?
         ActiveSupport.on_load(:active_record_sqlite3adapter) do
           Rails.logger.warn(SQLITE3_PRODUCTION_WARN)
         end
       end
     end
 
     initializer "active_record.set_configs" do |app|
-      configs = app.config.active_record.except(:query_log_tags_enabled, :query_log_tags, :cache_query_log_tags)
+      configs = app.config.active_record
 
       config.after_initialize do
         configs.each do |k, v|
@@ -226,6 +226,20 @@ class Railtie < Rails::Railtie # :nodoc:
       end
 
       ActiveSupport.on_load(:active_record) do
+        # Configs used in other initializers
+        configs = configs.except(
+          :migration_error,
+          :database_selector,
+          :database_resolver,
+          :database_resolver_context,
+          :query_log_tags_enabled,
+          :query_log_tags,
+          :cache_query_log_tags,
+          :sqlite3_production_warning,
+          :check_schema_cache_dump_version,
+          :use_schema_cache_dump
+        )
+
         configs.each do |k, v|
           next if k == :encryption
           setter = "#{k}="