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

Check env_url only once

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

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

@ -79,9 +79,14 @@ def config
if key.to_s == env
env_url = ENV["DATABASE_URL"]
end
env_url ||= ENV["DATABASE_URL_#{key.upcase}"]
entry ||= {} if env_url
entry.merge!("url" => env_url) { |h, v1, v2| v1 || v2 } if entry.is_a?(Hash) && env_url
if env_url
entry ||= {}
entry.merge!("url" => env_url) { |h, v1, v2| v1 || v2 } if entry.is_a?(Hash)
end
hash[key] = entry if entry
end