diff options
| author | Andrew White <andrew.white@unboxed.co> | 2016-11-02 16:48:43 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2016-11-02 16:48:43 +0000 |
| commit | 4f2de3480c8bbdb928e3b3c6e71674f8c5992a60 (patch) | |
| tree | e65778a4664745ec02d553b0b7354323e12a54d9 /activerecord/lib | |
| parent | 24ca0154a355200283fc20a595983f81aa1c7cb2 (diff) | |
| download | rails-4f2de3480c8bbdb928e3b3c6e71674f8c5992a60.tar.gz rails-4f2de3480c8bbdb928e3b3c6e71674f8c5992a60.tar.bz2 rails-4f2de3480c8bbdb928e3b3c6e71674f8c5992a60.zip | |
Fix deprecation warnings on URI.unescape
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index 04ab7e0a43..cd1575d049 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -1,4 +1,5 @@ require 'uri' +require 'active_support/core_ext/uri' module ActiveRecord class Base @@ -68,7 +69,7 @@ module ActiveRecord :database => config.path.sub(%r{^/},""), :host => config.host } spec.reject!{ |_,value| value.blank? } - spec.map { |key,value| spec[key] = URI.unescape(value) if value.is_a?(String) } + spec.map { |key,value| spec[key] = URI.parser.unescape(value) if value.is_a?(String) } if config.query options = Hash[config.query.split("&").map{ |pair| pair.split("=") }].symbolize_keys spec.merge!(options) |