Merge pull request #25868 from kamipo/fix_payload_class_name_to_spec_name

Fix `payload[:class_name]` to `payload[:spec_name]`

2 files changed, 4 insertions, 9 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 1d9579f1a8..5acc6e7008 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -855,7 +855,7 @@ module ActiveRecord
           connection_id: object_id
         }
         if spec
-          payload[:class_name] = spec.name
+          payload[:spec_name] = spec.name
           payload[:config] = spec.config
         end
 
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 6d142285cd..0ec33f7d87 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -987,16 +987,11 @@ module ActiveRecord
 
         # When connections are established in the future, begin a transaction too
         @connection_subscriber = ActiveSupport::Notifications.subscribe('!connection.active_record') do |_, _, _, _, payload|
-          model_class = nil
-          begin
-            model_class = payload[:class_name].constantize if payload[:class_name]
-          rescue NameError
-            model_class = nil
-          end
+          spec_name = payload[:spec_name] if payload.key?(:spec_name)
 
-          if model_class
+          if spec_name
             begin
-              connection = ActiveRecord::Base.connection_handler.retrieve_connection(model_class)
+              connection = ActiveRecord::Base.connection_handler.retrieve_connection(spec_name)
             rescue ConnectionNotEstablished
               connection = nil
             end