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

1 files changed, 26 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 52b3d3e5e6..3ca66223b6 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -8,31 +8,47 @@ db_namespace = namespace :db do
 
   namespace :create do
     task :all => :load_config do
-      ActiveRecord::Tasks::DatabaseTasks.create_all
+      begin
+        ActiveRecord::Tasks::DatabaseTasks.create_all
+      rescue
+        exit(1)
+      end
     end
   end
 
   desc 'Create the database from DATABASE_URL or config/database.yml for the current Rails.env (use db:create:all to create all databases in the config)'
   task :create => [:load_config] do
-    if ENV['DATABASE_URL']
-      ActiveRecord::Tasks::DatabaseTasks.create_database_url
-    else
-      ActiveRecord::Tasks::DatabaseTasks.create_current
+    begin
+      if ENV['DATABASE_URL']
+        ActiveRecord::Tasks::DatabaseTasks.create_database_url
+      else
+        ActiveRecord::Tasks::DatabaseTasks.create_current
+      end
+    rescue
+      exit(1)
     end
   end
 
   namespace :drop do
     task :all => :load_config do
-      ActiveRecord::Tasks::DatabaseTasks.drop_all
+      begin
+        ActiveRecord::Tasks::DatabaseTasks.drop_all
+      rescue
+        exit(1)
+      end
     end
   end
 
   desc 'Drops the database using DATABASE_URL or the current Rails.env (use db:drop:all to drop all databases)'
   task :drop => [:load_config] do
-    if ENV['DATABASE_URL']
-      ActiveRecord::Tasks::DatabaseTasks.drop_database_url
-    else
-      ActiveRecord::Tasks::DatabaseTasks.drop_current
+    begin
+      if ENV['DATABASE_URL']
+        ActiveRecord::Tasks::DatabaseTasks.drop_database_url
+      else
+        ActiveRecord::Tasks::DatabaseTasks.drop_current
+      end
+    rescue
+      exit(1)
     end
   end