diff options
author | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2019-01-02 13:35:56 -0500 |
---|---|---|
committer | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2019-01-09 14:23:29 -0500 |
commit | d49899c15431104f8dad374363bac57479b4bd39 (patch) | |
tree | 4b6098ac607509a893a89a3d5cce0ae591b16c24 /railties | |
parent | 4b1ae57f0f905bd8cb63e435197db5014239d39e (diff) | |
download | rails-d49899c15431104f8dad374363bac57479b4bd39.tar.gz rails-d49899c15431104f8dad374363bac57479b4bd39.tar.bz2 rails-d49899c15431104f8dad374363bac57479b4bd39.zip |
Revise wording on invalid database error messages
Diffstat (limited to 'railties')
4 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index f756748e17..261a2ccb7b 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -267,7 +267,7 @@ module Rails super if !options[:skip_active_record] && !DATABASES.include?(options[:database]) - raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}." + raise Error, "Invalid value for --database option. Supported preconfigurations are: #{DATABASES.join(", ")}." end # Force sprockets and yarn to be skipped when generating API only apps. diff --git a/railties/lib/rails/generators/rails/db/system/change/change_generator.rb b/railties/lib/rails/generators/rails/db/system/change/change_generator.rb index e7696dec0c..63849eb18d 100644 --- a/railties/lib/rails/generators/rails/db/system/change/change_generator.rb +++ b/railties/lib/rails/generators/rails/db/system/change/change_generator.rb @@ -22,7 +22,7 @@ module Rails super unless DATABASES.include?(options[:to]) - raise Error, "Invalid value for --to option. Supported for preconfiguration are: #{DATABASES.join(", ")}." + raise Error, "Invalid value for --to option. Supported preconfigurations are: #{DATABASES.join(", ")}." end opt = options.dup diff --git a/railties/test/commands/db_system_change_test.rb b/railties/test/commands/db_system_change_test.rb index bac757f1eb..2ff45a7878 100644 --- a/railties/test/commands/db_system_change_test.rb +++ b/railties/test/commands/db_system_change_test.rb @@ -25,7 +25,7 @@ class Rails::Command::Db::System::ChangeCommandTest < ActiveSupport::TestCase assert_match <<~MSG.squish, output Invalid value for --to option. - Supported for preconfiguration are: + Supported preconfigurations are: mysql, postgresql, sqlite3, oracle, frontbase, ibm_db, sqlserver, jdbcmysql, jdbcsqlite3, jdbcpostgresql, jdbc. diff --git a/railties/test/generators/db_system_change_generator_test.rb b/railties/test/generators/db_system_change_generator_test.rb index 11726db244..d476bfd2dc 100644 --- a/railties/test/generators/db_system_change_generator_test.rb +++ b/railties/test/generators/db_system_change_generator_test.rb @@ -23,7 +23,7 @@ module Rails assert_match <<~MSG.squish, output Invalid value for --to option. - Supported for preconfiguration are: + Supported preconfigurations are: mysql, postgresql, sqlite3, oracle, frontbase, ibm_db, sqlserver, jdbcmysql, jdbcsqlite3, jdbcpostgresql, jdbc. |