aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-09 00:58:23 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-12 09:28:13 -0200
commit9b636dcf53e4ac410186a720d5bef783fc8648c4 (patch)
tree4eb46d9fbc6c85cdcd29028d6d6853957a910f7f /activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
parentc1d722558ee2bd373ca4768c48b8ae944e1bdb05 (diff)
downloadrails-9b636dcf53e4ac410186a720d5bef783fc8648c4.tar.gz
rails-9b636dcf53e4ac410186a720d5bef783fc8648c4.tar.bz2
rails-9b636dcf53e4ac410186a720d5bef783fc8648c4.zip
Bring back "database already exists" messages when running rake tasks
When running tasks such "rake db:setup", instead of showing messages like "db_development already exists", it was showing a big stack trace and a message "Couldn't create database for ..." with the configuration options, a very confusing message with a big trace. This brings back the functionality present in 3-2, showing the same message.
Diffstat (limited to 'activerecord/lib/active_record/tasks/sqlite_database_tasks.rb')
-rw-r--r--activerecord/lib/active_record/tasks/sqlite_database_tasks.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
index da01058a82..33c43c7774 100644
--- a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
@@ -9,10 +9,7 @@ module ActiveRecord
end
def create
- if File.exist?(configuration['database'])
- $stderr.puts "#{configuration['database']} already exists"
- return
- end
+ raise DatabaseAlreadyExists if File.exist?(configuration['database'])
establish_connection configuration
connection