Merge pull request #9041 from sodabrew/patch-1

Convert int, float, and bools from ENV['DATABASE_URL'] query args

1 files changed, 37 insertions, 11 deletions

diff --git a/activerecord/test/cases/connection_specification/resolver_test.rb b/activerecord/test/cases/connection_specification/resolver_test.rb
index 52de0efe7f..f0a2cdca1a 100644
--- a/activerecord/test/cases/connection_specification/resolver_test.rb
+++ b/activerecord/test/cases/connection_specification/resolver_test.rb
@@ -8,40 +8,66 @@ module ActiveRecord
           Resolver.new(spec, {}).spec.config
         end
 
+        def test_url_invalid_adapter
+          assert_raises(LoadError) do
+            resolve 'ridiculous://foo?encoding=utf8'
+          end
+        end
+
+        # The abstract adapter is used simply to bypass the bit of code that
+        # checks that the adapter file can be required in.
+
         def test_url_host_no_db
-          skip "only if mysql is available" unless current_adapter?(:MysqlAdapter, :Mysql2Adapter)
-          spec = resolve 'mysql://foo?encoding=utf8'
+          spec = resolve 'abstract://foo?encoding=utf8'
           assert_equal({
-            :adapter  => "mysql",
+            :adapter  => "abstract",
             :host     => "foo",
             :encoding => "utf8" }, spec)
         end
 
         def test_url_host_db
-          skip "only if mysql is available" unless current_adapter?(:MysqlAdapter, :Mysql2Adapter)
-          spec = resolve 'mysql://foo/bar?encoding=utf8'
+          spec = resolve 'abstract://foo/bar?encoding=utf8'
           assert_equal({
-            :adapter  => "mysql",
+            :adapter  => "abstract",
             :database => "bar",
             :host     => "foo",
             :encoding => "utf8" }, spec)
         end
 
         def test_url_port
-          skip "only if mysql is available" unless current_adapter?(:MysqlAdapter, :Mysql2Adapter)
-          spec = resolve 'mysql://foo:123?encoding=utf8'
+          spec = resolve 'abstract://foo:123?encoding=utf8'
           assert_equal({
-            :adapter  => "mysql",
+            :adapter  => "abstract",
             :port     => 123,
             :host     => "foo",
             :encoding => "utf8" }, spec)
         end
 
+        def test_url_query_numeric
+          spec = resolve 'abstract://foo:123?encoding=utf8&int=500&float=10.9'
+          assert_equal({
+            :adapter  => "abstract",
+            :port     => 123,
+            :int      => 500,
+            :float    => 10.9,
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+
+        def test_url_query_boolean
+          spec = resolve 'abstract://foo:123?true=true&false=false'
+          assert_equal({
+            :adapter  => "abstract",
+            :port     => 123,
+            :true     => true,
+            :false    => false,
+            :host     => "foo" }, spec)
+        end
+
         def test_encoded_password
-          skip "only if mysql is available" unless current_adapter?(:MysqlAdapter, :Mysql2Adapter)
           password = 'am@z1ng_p@ssw0rd#!'
           encoded_password = URI.encode_www_form_component(password)
-          spec = resolve "mysql://foo:#{encoded_password}@localhost/bar"
+          spec = resolve "abstract://foo:#{encoded_password}@localhost/bar"
           assert_equal password, spec[:password]
         end
       end