aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/tasks/database_tasks.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-26 12:27:58 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-10-26 12:27:58 -0600
commit04bc52f7dc4c264fd1825d565e058047c58bb694 (patch)
tree4ed8315bdb6429636db4b604555e505069de769a /activerecord/lib/active_record/tasks/database_tasks.rb
parent67b8f92743273370beca4d9c089ed9412fbfe940 (diff)
parentf33965f937044b01a472ed3cea14f0a401abaad4 (diff)
downloadrails-04bc52f7dc4c264fd1825d565e058047c58bb694.tar.gz
rails-04bc52f7dc4c264fd1825d565e058047c58bb694.tar.bz2
rails-04bc52f7dc4c264fd1825d565e058047c58bb694.zip
Merge pull request #19924 from iamvery/db-tasks-exit-status
Explicitly exit with status "1" for create and drop failures
Diffstat (limited to 'activerecord/lib/active_record/tasks/database_tasks.rb')
-rw-r--r--activerecord/lib/active_record/tasks/database_tasks.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index ea7927a435..c0c29a618c 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -94,8 +94,9 @@ module ActiveRecord
rescue DatabaseAlreadyExists
$stderr.puts "#{configuration['database']} already exists"
rescue Exception => error
- $stderr.puts error, *(error.backtrace)
+ $stderr.puts error
$stderr.puts "Couldn't create database for #{configuration.inspect}"
+ raise
end
def create_all
@@ -115,8 +116,9 @@ module ActiveRecord
rescue ActiveRecord::NoDatabaseError
$stderr.puts "Database '#{configuration['database']}' does not exist"
rescue Exception => error
- $stderr.puts error, *(error.backtrace)
+ $stderr.puts error
$stderr.puts "Couldn't drop #{configuration['database']}"
+ raise
end
def drop_all