aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/connection_specification.rb
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2016-05-05 15:25:08 -0500
committerArthur Neves <arthurnn@gmail.com>2016-05-05 15:39:27 -0500
commit598e7c9e2004b85146386571372423020ba7c52a (patch)
treed9749f43554c60008fe0fb3888c332356d0ef781 /activerecord/lib/active_record/connection_adapters/connection_specification.rb
parent34856ba9fa893bd1483ca5b08b65562cd5c02c58 (diff)
downloadrails-598e7c9e2004b85146386571372423020ba7c52a.tar.gz
rails-598e7c9e2004b85146386571372423020ba7c52a.tar.bz2
rails-598e7c9e2004b85146386571372423020ba7c52a.zip
s/specification_id/specification_name
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index 430937ae65..901c98b22b 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -3,10 +3,10 @@ require 'uri'
module ActiveRecord
module ConnectionAdapters
class ConnectionSpecification #:nodoc:
- attr_reader :config, :adapter_method, :id
+ attr_reader :name, :config, :adapter_method
- def initialize(id, config, adapter_method)
- @id, @config, @adapter_method = id, config, adapter_method
+ def initialize(name, config, adapter_method)
+ @name, @config, @adapter_method = name, config, adapter_method
end
def initialize_dup(original)
@@ -164,7 +164,7 @@ module ActiveRecord
# spec.config
# # => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" }
#
- def spec(config, id = nil)
+ def spec(config, name = nil)
spec = resolve(config).symbolize_keys
raise(AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter)
@@ -180,13 +180,13 @@ module ActiveRecord
adapter_method = "#{spec[:adapter]}_connection"
- id ||=
+ name ||=
if config.is_a?(Symbol)
config.to_s
else
"primary"
end
- ConnectionSpecification.new(id, spec, adapter_method)
+ ConnectionSpecification.new(name, spec, adapter_method)
end
private