2 files changed, 29 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index ecadb95a5d..26770bd951 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
 
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index b91bbeb412..8acf0bd520 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -69,9 +69,11 @@ module ActiveRecord
         class_for_adapter(configuration['adapter']).new(*arguments).create
       rescue DatabaseAlreadyExists
         $stderr.puts "#{configuration['database']} already exists"
+        raise
       rescue Exception => error
         $stderr.puts error, *(error.backtrace)
         $stderr.puts "Couldn't create database for #{configuration.inspect}"
+        raise
       end
 
       def create_all
@@ -95,6 +97,7 @@ module ActiveRecord
       rescue Exception => error
         $stderr.puts error, *(error.backtrace)
         $stderr.puts "Couldn't drop #{configuration['database']}"
+        raise
       end
 
       def drop_all