aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-07-17 21:41:09 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-07-17 22:04:06 +0900
commit38cd2aae43d8081785a79a81e4fef200a616e4ca (patch)
tree7b7571829f362a87cd6e152b0ae42d11be689809 /activerecord/lib
parent9a1ab6674477642b72cc1760bb7dd69c9a5d6705 (diff)
downloadrails-38cd2aae43d8081785a79a81e4fef200a616e4ca.tar.gz
rails-38cd2aae43d8081785a79a81e4fef200a616e4ca.tar.bz2
rails-38cd2aae43d8081785a79a81e4fef200a616e4ca.zip
Fix `payload[:class_name]` to `payload[:spec_name]`
Follow up to #20818. `retrieve_connection` is passed `spec_name` instead of `klass` since #24844.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb2
-rw-r--r--activerecord/lib/active_record/fixtures.rb11
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