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

1 files changed, 8 insertions, 0 deletions

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