From 4f2de3480c8bbdb928e3b3c6e71674f8c5992a60 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Wed, 2 Nov 2016 16:48:43 +0000 Subject: Fix deprecation warnings on URI.unescape --- .../connection_adapters/abstract/connection_specification.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3