Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8520

Show
Ignore:
Timestamp:
01/02/08 08:34:44 (5 months ago)
Author:
bitsweat
Message:

Merge [8519] from trunk: SQLite: db:drop:all doesn't fail silently if the database is already open. References #10577.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2-0-stable/railties/CHANGELOG

    r8435 r8520  
    11*SVN* 
     2 
     3* SQLite: db:drop:all doesn't fail silently if the database is already open.  #10577 [Cheah Chu Yeow, mrichman] 
    24 
    35* Ruby 1.9 compatibility.  #1689, #10546 [Cheah Chu Yeow, frederico] 

  • branches/2-0-stable/railties/lib/tasks/databases.rake

    r8388 r8520  
    344344    ActiveRecord::Base.connection.drop_database config['database'] 
    345345  when /^sqlite/ 
    346     FileUtils.rm_f(File.join(RAILS_ROOT, config['database'])) 
     346    FileUtils.rm(File.join(RAILS_ROOT, config['database'])) 
    347347  when 'postgresql' 
    348348    `dropdb "#{config['database']}"`