ibm_db 5.6.1 → 5.7.0

data/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb

@@ -9,12 +9,16 @@ module ActiveRecord
         @previous_database_url = ENV.delete("DATABASE_URL")
         @previous_rack_env = ENV.delete("RACK_ENV")
         @previous_rails_env = ENV.delete("RAILS_ENV")
+        @adapters_was = ActiveRecord::ConnectionAdapters.instance_variable_get(:@adapters).dup
+        @protocol_adapters = ActiveRecord.protocol_adapters.dup
       end
 
       teardown do
         ENV["DATABASE_URL"] = @previous_database_url
         ENV["RACK_ENV"] = @previous_rack_env
         ENV["RAILS_ENV"] = @previous_rails_env
+        ActiveRecord::ConnectionAdapters.instance_variable_set(:@adapters, @adapters_was)
+        ActiveRecord.protocol_adapters = @protocol_adapters
       end
 
       def resolve_config(config, env_name = ActiveRecord::ConnectionHandling::DEFAULT_ENV.call)
@@ -45,7 +49,7 @@ module ActiveRecord
 
       def test_resolver_with_database_uri_and_current_env_symbol_key
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
-        config = { "not_production" => {  "adapter" => "not_postgres", "database" => "not_foo" } }
+        config = { "not_production" => {  "adapter" => "abstract", "database" => "not_foo" } }
         actual = resolve_db_config(:default_env, config)
         expected = { adapter: "postgresql", database: "foo", host: "localhost" }
 
@@ -56,7 +60,7 @@ module ActiveRecord
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
         ENV["RAILS_ENV"]    = "foo"
 
-        config = { "not_production" => { "adapter" => "not_postgres", "database" => "not_foo" } }
+        config = { "not_production" => { "adapter" => "abstract", "database" => "not_foo" } }
         actual = resolve_db_config(:foo, config)
         expected = { adapter: "postgresql", database: "foo", host: "localhost" }
 
@@ -65,9 +69,9 @@ module ActiveRecord
 
       def test_resolver_with_nil_database_url_and_current_env
         ENV["RAILS_ENV"] = "foo"
-        config = { "foo" => { "adapter" => "postgres", "url" => ENV["DATABASE_URL"] } }
+        config = { "foo" => { "adapter" => "postgresql", "url" => ENV["DATABASE_URL"] } }
         actual = resolve_db_config(:foo, config)
-        expected_config = { adapter: "postgres", url: nil }
+        expected_config = { adapter: "postgresql" }
 
         assert_equal expected_config, actual.configuration_hash
       end
@@ -76,7 +80,7 @@ module ActiveRecord
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
         ENV["RACK_ENV"]     = "foo"
 
-        config = { "not_production" => { "adapter" => "not_postgres", "database" => "not_foo" } }
+        config = { "not_production" => { "adapter" => "abstract", "database" => "not_foo" } }
         actual = resolve_db_config(:foo, config)
         expected = { adapter: "postgresql", database: "foo", host: "localhost" }
 
@@ -85,9 +89,9 @@ module ActiveRecord
 
       def test_resolver_with_database_uri_and_known_key
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
-        config = { "production" => { "adapter" => "not_postgres", "database" => "not_foo", "host" => "localhost" } }
+        config = { "production" => { "adapter" => "abstract", "database" => "not_foo", "host" => "localhost" } }
         actual = resolve_db_config(:production, config)
-        expected = { adapter: "not_postgres", database: "not_foo", host: "localhost" }
+        expected = { adapter: "abstract", database: "not_foo", host: "localhost" }
 
         assert_equal expected, actual.configuration_hash
       end
@@ -105,42 +109,53 @@ module ActiveRecord
 
       def test_resolver_with_database_uri_and_unknown_symbol_key
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
-        config = { "not_production" => {  "adapter" => "not_postgres", "database" => "not_foo" } }
+        config = { "not_production" => {  "adapter" => "abstract", "database" => "not_foo" } }
         assert_raises AdapterNotSpecified do
           resolve_db_config(:production, config)
         end
       end
 
       def test_resolver_with_database_uri_and_supplied_url
-        ENV["DATABASE_URL"] = "not-postgres://not-localhost/not_foo"
-        config = { "production" => {  "adapter" => "also_not_postgres", "database" => "also_not_foo" } }
+        ENV["DATABASE_URL"] = "abstract://not-localhost/not_foo"
+        config = { "production" => {  "adapter" => "abstract", "database" => "also_not_foo" } }
         actual = resolve_db_config("postgres://localhost/foo", config)
         expected = { adapter: "postgresql", database: "foo", host: "localhost" }
 
         assert_equal expected, actual.configuration_hash
       end
 
+      def test_resolver_with_database_uri_containing_only_database_name
+        ENV["DATABASE_URL"] = "foo"
+        ENV["RAILS_ENV"] = "test"
+
+        config = { "test" => { "adapter" => "postgres", "database" => "not_foo", "host" => "localhost" } }
+        actual = resolve_db_config(:test, config)
+        expected = { adapter: "postgres", database: "foo", host: "localhost" }
+
+        assert_equal expected, actual.configuration_hash
+      end
+
       def test_jdbc_url
-        config   = { "production" => { "url" => "jdbc:postgres://localhost/foo" } }
+        config   = { "production" => { "adapter" => "abstract", "url" => "jdbc:postgres://localhost/foo" } }
         actual   = resolve_config(config, "production")
         assert_equal config["production"].symbolize_keys, actual
       end
 
       def test_http_url
-        config   = { "production" => { "url" => "http://example.com/path" } }
+        config   = { "production" => { "adapter" => "abstract", "url" => "http://example.com/path" } }
         actual   = resolve_config(config, "production")
         assert_equal config["production"].symbolize_keys, actual
       end
 
       def test_https_url
-        config   = { "production" => { "url" => "https://example.com" } }
+        config   = { "production" => { "adapter" => "abstract", "url" => "https://example.com" } }
         actual   = resolve_config(config, "production")
         assert_equal config["production"].symbolize_keys, actual
       end
 
       def test_environment_does_not_exist_in_config_url_does_exist
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
-        config      = { "not_default_env" => { "adapter" => "not_postgres", "database" => "not_foo" } }
+        config      = { "not_default_env" => { "adapter" => "abstract", "database" => "not_foo" } }
         actual      = resolve_config(config, "default_env")
         expect_prod = {
           adapter: "postgresql",
@@ -152,8 +167,9 @@ module ActiveRecord
       end
 
       def test_url_with_hyphenated_scheme
+        ActiveRecord::ConnectionAdapters.register("ibm_db", "ActiveRecord::ConnectionAdapters::AbstractAdapter", "active_record/connection_adapters/abstract_adapter")
         ENV["DATABASE_URL"] = "ibm-db://localhost/foo"
-        config = { "default_env" => { "adapter" => "not_postgres", "database" => "not_foo", "host" => "localhost" } }
+        config = { "default_env" => { "adapter" => "abstract", "database" => "not_foo", "host" => "localhost" } }
         actual = resolve_db_config(:default_env, config)
         expected = { adapter: "ibm_db", database: "foo", host: "localhost" }
 
@@ -199,7 +215,7 @@ module ActiveRecord
       end
 
       def test_hash
-        config = { "production" => { "adapter" => "postgres", "database" => "foo" } }
+        config = { "production" => { "adapter" => "postgresql", "database" => "foo" } }
         actual = resolve_config(config, "production")
         assert_equal config["production"].symbolize_keys, actual
       end
@@ -270,7 +286,7 @@ module ActiveRecord
       end
 
       def test_url_sub_key_with_database_url
-        ENV["DATABASE_URL"] = "NOT-POSTGRES://localhost/NOT_FOO"
+        ENV["DATABASE_URL"] = "abstract://localhost/NOT_FOO"
 
         config   = { "default_env" => { "url" => "postgres://localhost/foo" } }
         actual   = resolve_config(config)
@@ -286,7 +302,7 @@ module ActiveRecord
       def test_no_url_sub_key_with_database_url_doesnt_trample_other_envs
         ENV["DATABASE_URL"] = "postgres://localhost/baz"
 
-        config   = { "default_env" => { "database" => "foo" }, "other_env" => { "url" => "postgres://foohost/bardb" } }
+        config   = { "default_env" => { "adapter" => "abstract", "database" => "foo" }, "other_env" => { "url" => "postgres://foohost/bardb" } }
         expected = {
           default_env: {
             database: "baz",
@@ -307,7 +323,7 @@ module ActiveRecord
       def test_merge_no_conflicts_with_database_url
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
 
-        config   = { "default_env" => { "pool" => "5" } }
+        config   = { "default_env" => { "adapter" => "abstract", "pool" => "5" } }
         actual   = resolve_config(config)
         expected = {
           adapter: "postgresql",
@@ -322,7 +338,7 @@ module ActiveRecord
       def test_merge_conflicts_with_database_url
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
 
-        config   = { "default_env" => { "adapter" => "NOT-POSTGRES", "database" => "NOT-FOO", "pool" => "5" } }
+        config   = { "default_env" => { "adapter" => "abstract", "database" => "NOT-FOO", "pool" => "5" } }
         actual   = resolve_config(config)
         expected = {
           adapter: "postgresql",
@@ -352,7 +368,7 @@ module ActiveRecord
       def test_merge_no_conflicts_with_database_url_and_numeric_pool
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
 
-        config   = { "default_env" => { "pool" => 5 } }
+        config   = { "default_env" => { "adapter" => "abstract", "pool" => 5 } }
         actual   = resolve_config(config)
         expected = {
           adapter: "postgresql",
@@ -369,8 +385,8 @@ module ActiveRecord
 
         config = {
           "default_env" => {
-            "primary" => { "pool" => 5 },
-            "animals" => { "pool" => 5 }
+            "primary" => { "adapter" => "abstract", "pool" => 5 },
+            "animals" => { "adapter" => "abstract", "pool" => 5 }
           }
         }
 
@@ -387,7 +403,7 @@ module ActiveRecord
 
         configs = ActiveRecord::DatabaseConfigurations.new(config)
         actual = configs.configs_for(env_name: "default_env", name: "animals").configuration_hash
-        expected = { pool: 5 }
+        expected = { adapter: "abstract", pool: 5 }
 
         assert_equal expected, actual
       end
@@ -399,8 +415,8 @@ module ActiveRecord
 
         config = {
           "default_env" => {
-            "primary" => { "pool" => 5 },
-            "animals" => { "pool" => 5 }
+            "primary" => { "adapter" => "abstract", "pool" => 5 },
+            "animals" => { "adapter" => "abstract", "pool" => 5 }
           }
         }
 
@@ -418,7 +434,7 @@ module ActiveRecord
 
       def test_does_not_change_other_environments
         ENV["DATABASE_URL"] = "postgres://localhost/foo"
-        config = { "production" => { "adapter" => "not_postgres", "database" => "not_foo", "host" => "localhost" }, "default_env" => {} }
+        config = { "production" => { "adapter" => "abstract", "database" => "not_foo", "host" => "localhost" }, "default_env" => {} }
 
         actual = resolve_db_config(:production, config)
         assert_equal config["production"].symbolize_keys, actual.configuration_hash
@@ -431,6 +447,59 @@ module ActiveRecord
           adapter: "postgresql",
         }, actual.configuration_hash)
       end
+
+      def test_protocol_adapter_mapping_is_used
+        ENV["DATABASE_URL"] = "mysql://localhost/exampledb"
+        ENV["RAILS_ENV"] = "production"
+
+        actual = resolve_db_config(:production, {})
+        expected = { adapter: "mysql2", database: "exampledb", host: "localhost" }
+
+        assert_equal expected, actual.configuration_hash
+      end
+
+      def test_protocol_adapter_mapping_falls_through_if_non_found
+        ENV["DATABASE_URL"] = "unknown://localhost/exampledb"
+        ENV["RAILS_ENV"] = "production"
+
+        actual = resolve_db_config(:production, {})
+        expected = { adapter: "unknown", database: "exampledb", host: "localhost" }
+
+        assert_equal expected, actual.configuration_hash
+      end
+
+      def test_protocol_adapter_mapping_is_used_and_can_be_updated
+        ActiveRecord.protocol_adapters.potato = "postgresql"
+        ENV["DATABASE_URL"] = "potato://localhost/exampledb"
+        ENV["RAILS_ENV"] = "production"
+
+        actual = resolve_db_config(:production, {})
+        expected = { adapter: "postgresql", database: "exampledb", host: "localhost" }
+
+        assert_equal expected, actual.configuration_hash
+      end
+
+      def test_protocol_adapter_mapping_translates_underscores_to_dashes
+        ActiveRecord.protocol_adapters.custom_protocol = "postgresql"
+        ENV["DATABASE_URL"] = "custom-protocol://localhost/exampledb"
+        ENV["RAILS_ENV"] = "production"
+
+        actual = resolve_db_config(:production, {})
+        expected = { adapter: "postgresql", database: "exampledb", host: "localhost" }
+
+        assert_equal expected, actual.configuration_hash
+      end
+
+      def test_protocol_adapter_mapping_handles_sqlite3_file_urls
+        ActiveRecord.protocol_adapters.custom_protocol = "sqlite3"
+        ENV["DATABASE_URL"] = "custom-protocol:/path/to/db.sqlite3"
+        ENV["RAILS_ENV"] = "production"
+
+        actual = resolve_db_config(:production, {})
+        expected = { adapter: "sqlite3", database: "/path/to/db.sqlite3" }
+
+        assert_equal expected, actual.configuration_hash
+      end
     end
   end
 end

data/test/cases/connection_adapters/mysql_type_lookup_test.rb

@@ -3,14 +3,14 @@
 require "cases/helper"
 require "support/connection_helper"
 
-if current_adapter?(:Mysql2Adapter)
-  module ActiveRecord
-    module ConnectionAdapters
-      class MysqlTypeLookupTest < ActiveRecord::TestCase
+module ActiveRecord
+  module ConnectionAdapters
+    class MysqlTypeLookupTest < ActiveRecord::TestCase
+      if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
         include ConnectionHelper
 
         setup do
-          @connection = ActiveRecord::Base.connection
+          @connection = ActiveRecord::Base.lease_connection
         end
 
         def teardown

data/test/cases/connection_adapters/registration_test.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class RegistrationTest < ActiveRecord::TestCase
+      def setup
+        @original_adapters = ActiveRecord::ConnectionAdapters.instance_variable_get(:@adapters).dup
+        ActiveRecord::ConnectionAdapters.instance_variable_get(:@adapters).delete("fake")
+        @fake_adapter_path = File.expand_path("../../support/fake_adapter.rb", __dir__)
+      end
+
+      def teardown
+        ActiveRecord::ConnectionAdapters.instance_variable_set(:@adapters, @original_adapters)
+      end
+
+      test "#register registers a new database adapter and #resolve can find it and raises if it cannot" do
+        exception = assert_raises(ActiveRecord::AdapterNotFound) do
+          ActiveRecord::ConnectionAdapters.resolve("fake")
+        end
+
+        assert_match(
+          /Database configuration specifies nonexistent 'fake' adapter. Available adapters are:/,
+          exception.message
+        )
+
+        ActiveRecord::ConnectionAdapters.register("fake", "FakeActiveRecordAdapter", @fake_adapter_path)
+
+        assert_equal "FakeActiveRecordAdapter", ActiveRecord::ConnectionAdapters.resolve("fake").name
+      end
+
+      test "#register allows for symbol key" do
+        exception = assert_raises(ActiveRecord::AdapterNotFound) do
+          ActiveRecord::ConnectionAdapters.resolve("fake")
+        end
+
+        assert_match(
+          /Database configuration specifies nonexistent 'fake' adapter. Available adapters are:/,
+          exception.message
+        )
+
+        ActiveRecord::ConnectionAdapters.register(:fake, "FakeActiveRecordAdapter", @fake_adapter_path)
+
+        assert_equal "FakeActiveRecordAdapter", ActiveRecord::ConnectionAdapters.resolve("fake").name
+      end
+
+      test "#resolve allows for symbol key" do
+        exception = assert_raises(ActiveRecord::AdapterNotFound) do
+          ActiveRecord::ConnectionAdapters.resolve("fake")
+        end
+
+        assert_match(
+          /Database configuration specifies nonexistent 'fake' adapter. Available adapters are:/,
+          exception.message
+        )
+
+        ActiveRecord::ConnectionAdapters.register("fake", "FakeActiveRecordAdapter", @fake_adapter_path)
+
+        assert_equal "FakeActiveRecordAdapter", ActiveRecord::ConnectionAdapters.resolve(:fake).name
+      end
+    end
+
+    class RegistrationIsolatedTest < ActiveRecord::TestCase
+      include ActiveSupport::Testing::Isolation
+
+      # IBM_DB: isolation subprocess spawns a fresh Ruby process on Windows. RUBYOPT
+      # is not propagated through IO.popen's env-hash form, so the child crashes before
+      # reaching any test body. Return a pre-built skipped result before isolation can
+      # spawn the subprocess so the parallel runner sees a proper Skip, not a crash.
+      def run
+        if ENV["ARCONN"] == "ibm_db"
+          inst = dup
+          inst.failures << Minitest::Skip.new("IBM_DB: isolation subprocess cannot boot IBM_DB adapter on Windows")
+          return defined?(Minitest::Result) ? Minitest::Result.from(inst) : inst
+        end
+        super
+      end
+
+      def setup
+        @original_adapters = ActiveRecord::ConnectionAdapters.instance_variable_get(:@adapters).dup
+      end
+
+      test "#resolve raises if the adapter is using the pre 7.2 adapter registration API" do
+        exception = assert_raises(ActiveRecord::AdapterNotFound) do
+          ActiveRecord::ConnectionAdapters.resolve("fake_legacy")
+        end
+
+        assert_equal(
+          "Database configuration specifies nonexistent 'fake_legacy' adapter. Available adapters are: abstract, fake, mysql2, postgresql, sqlite3, trilogy. Ensure that the adapter is spelled correctly in config/database.yml and that you've added the necessary adapter gem to your Gemfile if it's not in the list of available adapters.",
+          exception.message
+        )
+      ensure
+        ActiveRecord::ConnectionAdapters.instance_variable_get(:@adapters).delete("fake_legacy")
+      end
+    end
+  end
+end