Permalink
Browse files

Merge [8519] from trunk: SQLite: db:drop:all doesn't fail silently if…

… the database is already open. References #10577.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@8520 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c48a1fc commit 131acec68532d32241037d05fd530db30b2b6020 @jeremy jeremy committed Jan 2, 2008
Showing with 3 additions and 1 deletion.
  1. +2 −0 railties/CHANGELOG
  2. +1 −1 railties/lib/tasks/databases.rake
View
@@ -1,5 +1,7 @@
*SVN*
+* SQLite: db:drop:all doesn't fail silently if the database is already open. #10577 [Cheah Chu Yeow, mrichman]
+
* Ruby 1.9 compatibility. #1689, #10546 [Cheah Chu Yeow, frederico]
@@ -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

0 comments on commit 131acec

Please sign in to comment.