From d035ba143a46e64e6110b6a690e0655e8574fd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 7 Apr 2014 19:17:43 -0300 Subject: Check env_url only once --- activerecord/lib/active_record/connection_handling.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb index a1fb83fde5..08849b3722 100644 --- a/activerecord/lib/active_record/connection_handling.rb +++ b/activerecord/lib/active_record/connection_handling.rb @@ -79,9 +79,14 @@ module ActiveRecord 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 -- cgit v1.2.3