Remove `name` from `establish_connection`

Instead of passing a separete name variable, we can make the resolver
merge a name on the config, and use that before creating the Specification.

1 files changed, 6 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb
index b3fd837abe..086c678af5 100644
--- a/activerecord/lib/active_record/connection_handling.rb
+++ b/activerecord/lib/active_record/connection_handling.rb
@@ -50,7 +50,12 @@ module ActiveRecord
       config ||= DEFAULT_ENV.call.to_sym
       spec_name = self == Base ? "primary" : name
       self.connection_specification_name = spec_name
-      connection_handler.establish_connection(config, name: spec_name)
+
+      resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(Base.configurations)
+      spec = resolver.resolve(config).symbolize_keys
+      spec[:name] = spec_name
+
+      connection_handler.establish_connection(spec)
     end
 
     class MergeAndResolveDefaultUrlConfig # :nodoc: