aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/connection_specification.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2013-12-24 09:26:34 +0100
committerJosé Valim <jose.valim@plataformatec.com.br>2013-12-24 09:26:34 +0100
commitd8336cab32d0d8e8c2877cac26111cbecb5ac872 (patch)
tree3b382c66a548854040f30ffb86651af625329d51 /activerecord/lib/active_record/connection_adapters/connection_specification.rb
parent222f00b42266e604bb8894771162672aadd1bacc (diff)
downloadrails-d8336cab32d0d8e8c2877cac26111cbecb5ac872.tar.gz
rails-d8336cab32d0d8e8c2877cac26111cbecb5ac872.tar.bz2
rails-d8336cab32d0d8e8c2877cac26111cbecb5ac872.zip
Fix build failures related to the new ENV options in yml
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index a87eed5243..5f50ca6aae 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -48,11 +48,11 @@ module ActiveRecord
# an environment key or a url spec. So we support both for
# now but it would be nice to limit the environment key only
# for symbols.
- spec = configurations.fetch(spec.to_s) do
+ config = configurations.fetch(spec.to_s) do
resolve_string_connection(spec) if spec.is_a?(String)
end
- raise(AdapterNotSpecified, "#{spec} database is not configured") unless spec
- resolve_connection spec
+ raise(AdapterNotSpecified, "#{spec} database is not configured") unless config
+ resolve_connection config
end
def resolve_hash_connection(spec) # :nodoc: