TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Only call DEFAULT_ENV proc one time

Browse Source
This commit is contained in:
Rafael Mendonça França 2014-04-07 19:17:06 -03:00 committed by Matthew Draper
parent d459f751c9
commit 2b6d1da6b4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activerecord/lib/active_record/connection_handling.rb
View File

@ -70,10 +70,13 @@ def resolve
private
def config
env = DEFAULT_ENV.call.to_s
cfg = Hash.new do |hash, key|
entry = @raw_config[key]
env_url = nil
if key.to_s == DEFAULT_ENV.call.to_s
if key.to_s == env
env_url = ENV["DATABASE_URL"]
end
env_url ||= ENV["DATABASE_URL_#{key.upcase}"]
@ -83,7 +86,7 @@ def config
end
@raw_config.keys.each {|k| cfg[k] }
cfg[DEFAULT_ENV.call.to_s]
cfg[env]
cfg
end