From 38cd2aae43d8081785a79a81e4fef200a616e4ca Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Sun, 17 Jul 2016 21:41:09 +0900
Subject: [PATCH] Fix `payload[:class_name]` to `payload[:spec_name]`

Follow up to #20818.

`retrieve_connection` is passed `spec_name` instead of `klass` since #24844.
---
 .../connection_adapters/abstract/connection_pool.rb   |  2 +-
 activerecord/lib/active_record/fixtures.rb            | 11 +++--------
 activerecord/test/cases/connection_pool_test.rb       |  4 ++--
 activerecord/test/cases/fixtures_test.rb              |  4 ++--
 activerecord/test/cases/query_cache_test.rb           |  2 ++
 5 files changed, 10 insertions(+), 13 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
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 2bdabaee62..bbcb42d58e 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -347,8 +347,8 @@ module ActiveRecord
           payloads << payload
         end
         ActiveRecord::Base.establish_connection :arunit
-        assert_equal [:class_name, :config, :connection_id], payloads[0].keys.sort
-        assert_equal 'primary', payloads[0][:class_name]
+        assert_equal [:config, :connection_id, :spec_name], payloads[0].keys.sort
+        assert_equal 'primary', payloads[0][:spec_name]
       ensure
         ActiveSupport::Notifications.unsubscribe(subscription) if subscription
       end
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index a06aa4b247..df53bbf950 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -650,10 +650,10 @@ class TransactionalFixturesOnConnectionNotification < ActiveRecord::TestCase
   private
 
     def fire_connection_notification(connection)
-      ActiveRecord::Base.connection_handler.stubs(:retrieve_connection).with(Book).returns(connection)
+      ActiveRecord::Base.connection_handler.stubs(:retrieve_connection).with('book').returns(connection)
       message_bus = ActiveSupport::Notifications.instrumenter
       payload = {
-        class_name: 'Book',
+        spec_name: 'book',
         config: nil,
         connection_id: connection.object_id
       }
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 03ec063671..085636553e 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -6,6 +6,8 @@ require 'models/post'
 require 'rack'
 
 class QueryCacheTest < ActiveRecord::TestCase
+  self.use_transactional_tests = false
+
   fixtures :tasks, :topics, :categories, :posts, :categories_posts
 
   teardown do