From 779ccf8a0e6a8bf7bb362c30dac4a340599ab113 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Tue, 24 May 2016 23:57:43 -0400 Subject: 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. --- .../connection_adapters/abstract/connection_pool.rb | 17 +++++++---------- .../connection_adapters/connection_specification.rb | 12 +++--------- 2 files changed, 10 insertions(+), 19 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters') 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 c124f1c4b5..ca04058539 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -837,13 +837,9 @@ module ActiveRecord end alias :connection_pools :connection_pool_list - def establish_connection(spec_or_config, name: "primary") - if spec_or_config.is_a?(ConnectionSpecification) - spec = spec_or_config - else - resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(ActiveRecord::Base.configurations) - spec = resolver.spec(spec_or_config, name) - end + def establish_connection(config) + resolver = ConnectionSpecification::Resolver.new(Base.configurations) + spec = resolver.spec(config) remove_connection(spec.name) owner_to_pool[spec.name] = ConnectionAdapters::ConnectionPool.new(spec) @@ -879,9 +875,9 @@ module ActiveRecord # for (not necessarily the current class). def retrieve_connection(spec_name) #:nodoc: pool = retrieve_connection_pool(spec_name) - raise ConnectionNotEstablished, "No connection pool with id #{spec_name} found." unless pool + raise ConnectionNotEstablished, "No connection pool with id '#{spec_name}' found." unless pool conn = pool.connection - raise ConnectionNotEstablished, "No connection for #{spec_name} in connection pool" unless conn + raise ConnectionNotEstablished, "No connection for '#{spec_name}' in connection pool" unless conn conn end @@ -915,7 +911,8 @@ module ActiveRecord # A connection was established in an ancestor process that must have # subsequently forked. We can't reuse the connection, but we can copy # the specification and establish a new connection with it. - establish_connection(ancestor_pool.spec).tap do |pool| + spec = ancestor_pool.spec + establish_connection(spec.config.merge("name" => spec.name)).tap do |pool| pool.schema_cache = ancestor_pool.schema_cache if ancestor_pool.schema_cache end else diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb index 7636de067c..0f4bd1c84a 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -164,7 +164,7 @@ module ActiveRecord # spec.config # # => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" } # - def spec(config, name = nil) + def spec(config) spec = resolve(config).symbolize_keys raise(AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter) @@ -184,13 +184,7 @@ module ActiveRecord raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter" end - name ||= - if config.is_a?(Symbol) - config.to_s - else - "primary" - end - ConnectionSpecification.new(name, spec, adapter_method) + ConnectionSpecification.new(spec.delete(:name) || "primary", spec, adapter_method) end private @@ -235,7 +229,7 @@ module ActiveRecord # def resolve_symbol_connection(spec) if config = configurations[spec.to_s] - resolve_connection(config) + resolve_connection(config).merge("name" => spec.to_s) else raise(AdapterNotSpecified, "'#{spec}' database is not configured. Available: #{configurations.keys.inspect}") end -- cgit v1.2.3