Merge pull request rails#50108 from jonathanhefner/follow-up-50104

Change disjunction to conjunction in suggestion

Author: jonathanhefner

activerecord/lib/active_record/connection_adapters.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/filters"
+
 module ActiveRecord
   module ConnectionAdapters
     extend ActiveSupport::Autoload
@@ -32,7 +34,7 @@ def resolve(adapter_name) # :nodoc:
           raise AdapterNotFound, <<~MSG.squish
             Database configuration specifies nonexistent '#{adapter_name}' adapter.
             Available adapters are: #{@adapters.keys.sort.join(", ")}.
-            Ensure that the adapter is spelled correctly in config/database.yml or that you've added the necessary
+            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.
           MSG
         end

activerecord/test/cases/database_configurations/resolver_test.rb

@@ -16,7 +16,7 @@ def test_url_invalid_adapter
             Base.connection_handler.establish_connection "ridiculous://foo?encoding=utf8"
           end
 
-          assert_match "Database configuration specifies nonexistent 'ridiculous' adapter. Available adapters are: abstract, fake, mysql2, postgresql, sqlite3, trilogy. Ensure that the adapter is spelled correctly in config/database.yml or that you've added the necessary adapter gem to your Gemfile if it's not in the list of available adapters.", error.message
+          assert_match "Database configuration specifies nonexistent 'ridiculous' 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.", error.message
         end
 
         # The abstract adapter is used simply to bypass the bit of code that