Merge pull request #16295 from kenn/no_stacktrace_drop_task

No verbose backtrace by db:drop when database does not exist.
rails · Jul 28, 2014 · 7bd0af4 · 7bd0af4
2 parents 4738199 + 2ee8419
commit 7bd0af4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   No verbose backtrace by db:drop when database does not exist.
+
+    Fixes #16295.
+
+    *Kenn Ejima*
+
 *   Add support for Postgresql JSONB.
 
     Example:

diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -110,6 +110,8 @@ def create_current(environment = env)
       def drop(*arguments)
         configuration = arguments.first
         class_for_adapter(configuration['adapter']).new(*arguments).drop
+      rescue ActiveRecord::NoDatabaseError
+        $stderr.puts "Database '#{configuration['database']}' does not exist"
       rescue Exception => error
         $stderr.puts error, *(error.backtrace)
         $stderr.puts "Couldn't drop #{configuration['database']}"