Merge pull request #7593 from veader/patch-1

Decode attributes pulled from URI.parse
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/connection_specification.rb

3 files changed, 14 insertions, 0 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index aafdbec25c..8c55c60769 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 3.2.9 (unreleased)
 
+*   Decode URI encoded attributes on database connection URLs.
+
+    *Shawn Veader*
+
 *   Fix AR#dup to nullify the validation errors in the dup'ed object. Previously the original
     and the dup'ed object shared the same errors.
 
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 6c8a102caf..63ab470fff 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -68,6 +68,8 @@ 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) }
           if config.query
             options = Hash[config.query.split("&").map{ |pair| pair.split("=") }].symbolize_keys
             spec.merge!(options)
diff --git a/activerecord/test/cases/connection_specification/resolver_test.rb b/activerecord/test/cases/connection_specification/resolver_test.rb
index 0e9ab8e3fc..d66bb60412 100644
--- a/activerecord/test/cases/connection_specification/resolver_test.rb
+++ b/activerecord/test/cases/connection_specification/resolver_test.rb
@@ -38,6 +38,14 @@ module ActiveRecord
             :host     => "foo",
             :encoding => "utf8" }, spec)
         end
+
+        def test_encoded_password
+          skip "only if mysql is available" unless defined?(MysqlAdapter)
+          password = 'am@z1ng_p@ssw0rd#!'
+          encoded_password = URI.encode_www_form_component(password)
+          spec = resolve "mysql://foo:#{encoded_password}@localhost/bar"
+          assert_equal password, spec[:password]
+        end
       end
     end
   end