From 0ec047533a1d1ed14e001cfe7fdee818c0c18124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 7 Apr 2014 19:19:28 -0300 Subject: entry is always a Hash --- 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 08849b3722..1c8fbcb625 100644 --- a/activerecord/lib/active_record/connection_handling.rb +++ b/activerecord/lib/active_record/connection_handling.rb @@ -84,7 +84,7 @@ module ActiveRecord if env_url entry ||= {} - 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 } end hash[key] = entry if entry -- cgit v1.2.3