diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-15 16:59:29 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-15 16:59:29 -0200 |
commit | 8c66623627277df9dcc3c6215d369d2c50775cc1 (patch) | |
tree | 6f0d147f1508c9b24e455b0efc48d660e53a24d9 /activerecord/lib/active_record/tasks | |
parent | f6f4bed34d7f654e0dde8b2cd369066d0857e91c (diff) | |
parent | 22f80ae57b26907f662b7fd50a7270a6381e527e (diff) | |
download | rails-8c66623627277df9dcc3c6215d369d2c50775cc1.tar.gz rails-8c66623627277df9dcc3c6215d369d2c50775cc1.tar.bz2 rails-8c66623627277df9dcc3c6215d369d2c50775cc1.zip |
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
Diffstat (limited to 'activerecord/lib/active_record/tasks')
-rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index be7d496d15..0b6a49ac85 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 |