Merge pull request #12531 from iamvery/database-tasks-exit-status

Explicitly exit with status "1" for create and drop task failures

Conflicts:
	activerecord/CHANGELOG.md

3 files changed, 18 insertions, 6 deletions

diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 3e3a2828f3..d16cf40555 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -61,7 +61,9 @@ module ActiveRecord
         ActiveRecord::StatementInvalid.new("Can't create database 'dev'; database exists:")
       )
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      assert_raises(ActiveRecord::Tasks::DatabaseAlreadyExists) do
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
     end
   end
 
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index 6ea225178f..88ce666619 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -59,7 +59,9 @@ module ActiveRecord
       $stderr.expects(:puts).
         with("Couldn't create database for #{@configuration.inspect}")
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      assert_raises(Exception) do
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
     end
 
     def test_create_when_database_exists_outputs_info_to_stderr
@@ -69,7 +71,9 @@ module ActiveRecord
         ActiveRecord::StatementInvalid.new('database "my-app-db" already exists')
       )
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      assert_raises(ActiveRecord::Tasks::DatabaseAlreadyExists) do
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration
+      end
     end
   end
 
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
index da3471adf9..eecc3527d2 100644
--- a/activerecord/test/cases/tasks/sqlite_rake_test.rb
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -27,7 +27,9 @@ module ActiveRecord
 
       $stderr.expects(:puts).with("#{@database} already exists")
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+      assert_raises(ActiveRecord::Tasks::DatabaseAlreadyExists) do
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+      end
     end
 
     def test_db_create_with_file_does_nothing
@@ -36,7 +38,9 @@ module ActiveRecord
 
       ActiveRecord::Base.expects(:establish_connection).never
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+      assert_raises(ActiveRecord::Tasks::DatabaseAlreadyExists) do
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+      end
     end
 
     def test_db_create_establishes_a_connection
@@ -52,7 +56,9 @@ module ActiveRecord
       $stderr.expects(:puts).
         with("Couldn't create database for #{@configuration.inspect}")
 
-      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+      assert_raises(Exception) do
+        ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+      end
     end
   end