diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-07 19:19:28 -0300 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-04-08 15:15:04 +0930 |
| commit | 0ec047533a1d1ed14e001cfe7fdee818c0c18124 (patch) | |
| tree | c7a7cec0146ef0baee0befcb6484f8abfff7389d /activerecord/lib/active_record | |
| parent | d035ba143a46e64e6110b6a690e0655e8574fd49 (diff) | |
| download | rails-0ec047533a1d1ed14e001cfe7fdee818c0c18124.tar.gz rails-0ec047533a1d1ed14e001cfe7fdee818c0c18124.tar.bz2 rails-0ec047533a1d1ed14e001cfe7fdee818c0c18124.zip | |
entry is always a Hash
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_handling.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |