diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-02 08:28:58 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-02 08:28:58 +0000 |
| commit | 072b9d9fba2f1268a3b66de32eb6033124960f92 (patch) | |
| tree | bab102a1b0e18dc174b0def9ea2113080aae23b9 | |
| parent | 42622f23b4a1f0c0879d932ac460953f028686b5 (diff) | |
| download | rails-072b9d9fba2f1268a3b66de32eb6033124960f92.tar.gz rails-072b9d9fba2f1268a3b66de32eb6033124960f92.tar.bz2 rails-072b9d9fba2f1268a3b66de32eb6033124960f92.zip | |
SQLite: db:drop:all doesn't fail silently if the database is already open. Closes #10577.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 5313e3ead7..4e755b4d50 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* SQLite: db:drop:all doesn't fail silently if the database is already open. #10577 [Cheah Chu Yeow, mrichman] + * Introduce native mongrel handler and push mutex into dispatcher. [Jeremy Kemper] * Ruby 1.9 compatibility. #1689, #10546 [Cheah Chu Yeow, frederico] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 2ecd09af2f..80f16d7fa2 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -343,7 +343,7 @@ def drop_database(config) when 'mysql' ActiveRecord::Base.connection.drop_database config['database'] when /^sqlite/ - FileUtils.rm_f(File.join(RAILS_ROOT, config['database'])) + FileUtils.rm(File.join(RAILS_ROOT, config['database'])) when 'postgresql' `dropdb "#{config['database']}"` end |