aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/tasks/postgresql_rake_test.rb
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2019-07-29 08:40:57 -0700
committerJohn Hawthorn <john@hawthorn.email>2019-07-29 08:40:57 -0700
commit69700c9ee760c5880fc80af70a89b42bb791cf98 (patch)
treecdb954cd1ca7ea406be05278921a01fd6e0d97a8 /activerecord/test/cases/tasks/postgresql_rake_test.rb
parent2e6d9af6c8b9900481dabfca685b3e335c2f27aa (diff)
downloadrails-69700c9ee760c5880fc80af70a89b42bb791cf98.tar.gz
rails-69700c9ee760c5880fc80af70a89b42bb791cf98.tar.bz2
rails-69700c9ee760c5880fc80af70a89b42bb791cf98.zip
Move DatabaseAlreadyExists detection to DB adapter
Previously it was the responsibility of the database tasks to translate the invalid statement from creating a duplicate database into an ActiveRecord::Tasks::DatabaseAlreadyExists error. It's actually easier for us to do this detection inside of the adapter, where we already do a case statement on the return code to translate the error. This commit introduces ActiveRecord::DatabaseAlreadyExists, a subclass of StatementInvalid, and updates both AbstractMysqlAdapter and PostgresqlAdapter to return this more specific exception in that case. Because this is a subclass of the old exception, StatementInvalid, it should be backwards compatible with any code expecting that from create_database. This works for both create_database and exectute("CREATE DATABASE")
Diffstat (limited to 'activerecord/test/cases/tasks/postgresql_rake_test.rb')
-rw-r--r--activerecord/test/cases/tasks/postgresql_rake_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index f9df650687..d74ba0580d 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -129,7 +129,7 @@ if current_adapter?(:PostgreSQLAdapter)
with_stubbed_connection_establish_connection do
ActiveRecord::Base.connection.stub(
:create_database,
- proc { raise ActiveRecord::Tasks::DatabaseAlreadyExists }
+ proc { raise ActiveRecord::DatabaseAlreadyExists }
) do
ActiveRecord::Tasks::DatabaseTasks.create @configuration