From e533826f483d6a1f45d044a2017ff4e9d19a154e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 7 Apr 2014 19:05:50 -0300 Subject: Make sure DEFAULT_URL only override current environment database configuration --- activerecord/lib/active_record/connection_handling.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 5a83797ee5..567d121091 100644 --- a/activerecord/lib/active_record/connection_handling.rb +++ b/activerecord/lib/active_record/connection_handling.rb @@ -78,7 +78,7 @@ module ActiveRecord 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) + entry.merge!("url" => env_url) { |h, v1, v2| v1 || v2 } if entry.is_a?(Hash) && env_url hash[key] = entry if entry end -- cgit v1.2.3