mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Change disjunction to conjunction in suggestion
This commit is contained in:
Jonathan Hefner 2023-11-19 16:02:57 -06:00 committed by GitHub
parent 90b55e57a9 2c240c0366
commit c2a33059d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/lib/active_record/connection_adapters.rb
View File

@ -1,5 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
require "active_support/core_ext/string/filters"
module ActiveRecord module ActiveRecord
module ConnectionAdapters module ConnectionAdapters
extend ActiveSupport::Autoload extend ActiveSupport::Autoload
@ -32,7 +34,7 @@ module ActiveRecord
raise AdapterNotFound, <<~MSG.squish raise AdapterNotFound, <<~MSG.squish
Database configuration specifies nonexistent '#{adapter_name}' adapter. Database configuration specifies nonexistent '#{adapter_name}' adapter.
Available adapters are: #{@adapters.keys.sort.join(", ")}. 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. adapter gem to your Gemfile if it's not in the list of available adapters.
MSG MSG
end end

2
activerecord/test/cases/database_configurations/resolver_test.rb
View File

@ -16,7 +16,7 @@ module ActiveRecord
Base.connection_handler.establish_connection "ridiculous://foo?encoding=utf8" Base.connection_handler.establish_connection "ridiculous://foo?encoding=utf8"
end 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 end
# The abstract adapter is used simply to bypass the bit of code that # The abstract adapter is used simply to bypass the bit of code that