diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-07 19:17:06 -0300 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-04-08 15:15:01 +0930 |
| commit | 2b6d1da6b4f2a5dc1d51223ddb33b86ceab98479 (patch) | |
| tree | 8566b687ad6c89e4c69fc6fe552c286ff27b1f0b /activerecord | |
| parent | d459f751c934529e6a3cff36554a02d6ce7666f4 (diff) | |
| download | rails-2b6d1da6b4f2a5dc1d51223ddb33b86ceab98479.tar.gz rails-2b6d1da6b4f2a5dc1d51223ddb33b86ceab98479.tar.bz2 rails-2b6d1da6b4f2a5dc1d51223ddb33b86ceab98479.zip | |
Only call DEFAULT_ENV proc one time
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_handling.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb index 567d121091..a1fb83fde5 100644 --- a/activerecord/lib/active_record/connection_handling.rb +++ b/activerecord/lib/active_record/connection_handling.rb @@ -70,10 +70,13 @@ module ActiveRecord 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 @@ module ActiveRecord end @raw_config.keys.each {|k| cfg[k] } - cfg[DEFAULT_ENV.call.to_s] + cfg[env] cfg end |