diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-29 01:45:42 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-29 01:45:42 -0200 |
commit | 5d82c1fc56bedb3e0b736ec06b106b2989918978 (patch) | |
tree | 2b71e7ba92cc1d926936e812efe95d392c462679 /activerecord/lib/active_record/connection_adapters | |
parent | 721cf54ee7b88fe6a4920b4ecabdd5beaae904a5 (diff) | |
download | rails-5d82c1fc56bedb3e0b736ec06b106b2989918978.tar.gz rails-5d82c1fc56bedb3e0b736ec06b106b2989918978.tar.bz2 rails-5d82c1fc56bedb3e0b736ec06b106b2989918978.zip |
Make Active Record tests pass in isolation
Also remove the feature detecting for Ruby 1.9
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 3 |
1 files changed, 1 insertions, 2 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 63ab470fff..f366392c50 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -68,8 +68,7 @@ module ActiveRecord :database => config.path.sub(%r{^/},""), :host => config.host } spec.reject!{ |_,value| !value } - uri_parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI - spec.map { |key,value| spec[key] = uri_parser.unescape(value) if value.is_a?(String) } + spec.map { |key,value| spec[key] = URI.unescape(value) if value.is_a?(String) } if config.query options = Hash[config.query.split("&").map{ |pair| pair.split("=") }].symbolize_keys spec.merge!(options) |