Merge pull request #40014 from eileencodes/move-handler-cleanup-to-helper-method

Add helper method for resetting connection handlers in tests

activerecord/test/cases/base_test.rb

@@ -1719,7 +1719,7 @@ def test_protected_environments_are_stored_as_an_array_of_string
 
       assert_match %r/\AWrite query attempted while in readonly mode: INSERT /, conn2_error.message
     ensure
-      ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+      clean_up_connection_handler
       ActiveRecord::Base.establish_connection(:arunit)
     end
   end

activerecord/test/cases/connection_adapters/connection_handlers_multi_db_test.rb

@@ -21,7 +21,7 @@ def setup
       end
 
       def teardown
-        ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+        clean_up_connection_handler
       end
 
       class MultiConnectionTestModel < ActiveRecord::Base
@@ -369,8 +369,6 @@ def test_retrieve_connection_pool_with_invalid_id
       end
 
       def test_connection_handlers_are_per_thread_and_not_per_fiber
-        original_handlers = ActiveRecord::Base.connection_handlers
-
         ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler, reading: ActiveRecord::ConnectionAdapters::ConnectionHandler.new }
 
         reading_handler = ActiveRecord::Base.connection_handlers[:reading]
@@ -382,7 +380,7 @@ def test_connection_handlers_are_per_thread_and_not_per_fiber
         assert_not_equal reading, ActiveRecord::Base.connection_handler
         assert_equal reading, reading_handler
       ensure
-        ActiveRecord::Base.connection_handlers = original_handlers
+        clean_up_connection_handler
       end
 
       def test_connection_handlers_swapping_connections_in_fiber

activerecord/test/cases/connection_adapters/connection_handlers_multi_pool_config_test.rb

@@ -15,7 +15,7 @@ def setup
       end
 
       def teardown
-        ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+        clean_up_connection_handler
       end
 
       unless in_memory_db?

activerecord/test/cases/connection_adapters/connection_handlers_sharding_db_test.rb

@@ -21,7 +21,7 @@ def setup
       end
 
       def teardown
-        ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+        clean_up_connection_handler
       end
 
       unless in_memory_db?

activerecord/test/cases/database_selector_test.rb

@@ -12,7 +12,7 @@ class DatabaseSelectorTest < ActiveRecord::TestCase
     end
 
     teardown do
-      ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+      clean_up_connection_handler
     end
 
     def test_empty_session

activerecord/test/cases/fixtures_test.rb

@@ -1399,7 +1399,6 @@ class MultipleFixtureConnectionsTest < ActiveRecord::TestCase
 
     def setup
       @old_handler = ActiveRecord::Base.connection_handler
-      @old_handlers = ActiveRecord::Base.connection_handlers
       @prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config
       db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(ENV["RAILS_ENV"], "readonly", readonly_config)
 
@@ -1413,7 +1412,7 @@ def setup
     def teardown
       ActiveRecord::Base.configurations = @prev_configs
       ActiveRecord::Base.connection_handler = @old_handler
-      ActiveRecord::Base.connection_handlers = @old_handlers
+      clean_up_connection_handler
     end
 
     def test_uses_writing_connection_for_fixtures

activerecord/test/cases/helper.rb

@@ -149,6 +149,10 @@ def disable_extension!(extension, connection)
   connection.reconnect!
 end
 
+def clean_up_connection_handler
+  ActiveRecord::Base.connection_handlers = { ActiveRecord::Base.writing_role => ActiveRecord::Base.default_connection_handler }
+end
+
 def load_schema
   # silence verbose schema loading
   original_stdout = $stdout

activerecord/test/cases/query_cache_test.rb

@@ -93,7 +93,7 @@ def test_query_cache_is_applied_to_connections_in_all_handlers
 
     mw.call({})
   ensure
-    ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+    clean_up_connection_handler
   end
 
 
@@ -157,7 +157,7 @@ def test_query_cache_with_multiple_handlers_and_forked_processes
 
       rd.close
     ensure
-      ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+      clean_up_connection_handler
     end
   end
 
@@ -607,7 +607,7 @@ def test_clear_query_cache_is_called_on_all_connections
 
     mw.call({})
   ensure
-    ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+    clean_up_connection_handler
   end
 
   test "query cache is enabled in threads with shared connection" do

activerecord/test/cases/tasks/database_tasks_test.rb

@@ -1112,7 +1112,7 @@ def setup
       def teardown
         SchemaMigration.delete_all
         InternalMetadata.delete_all
-        ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+        clean_up_connection_handler
       end
 
       def test_truncate_tables

activerecord/test/cases/test_fixtures_test.rb

@@ -43,7 +43,6 @@ def test_run_successfuly
         end
       end
 
-      old_handlers = ActiveRecord::Base.connection_handlers
       old_handler = ActiveRecord::Base.connection_handler
       ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
       ActiveRecord::Base.connection_handlers = {}
@@ -53,7 +52,7 @@ def test_run_successfuly
       assert_predicate(test_result, :passed?)
     ensure
       ActiveRecord::Base.connection_handler = old_handler
-      ActiveRecord::Base.connection_handlers = old_handlers
+      clean_up_connection_handler
       FileUtils.rm_r(tmp_dir)
     end
   end