Sqlite errors when using dbfile directive in database.yml

I just found a related issue with using rake db:drop given a SQLite database.

The related block of code from railties/lib/tasks/databases.rake:

  def drop_database(config)
    case config['adapter']
    # ...
    when /^sqlite/
      FileUtils.rm(File.join(RAILS_ROOT, config['database']))
    # ...
    end
  end

If this is called when only the dbfile config option is provided, you get an error as you'd expect:

Couldn't drop : #<TypeError: can't convert nil into String>

Looked in 2-3-stable and it seems like there are some places where both are supported and others (like the two mentioned here) where only the database key is used.

The way forward it seems it to be one of these two options:

1. officially deprecate dbfile and therefore include code to warn users of this fact
2. ensure support for dbfile everywhere the database config option is used

I've attached a patch against 2-3-stable that should fix the two issues mentioned in this ticket, but making the above decision is more important for this ticket.

Assigning to the last committer to the line in question for databases.rake just to have someone listed.

2-3-stable: http://github.com/rails/rails/commit/32cfd4c2f8cebf3dd331b2f830a268...
master: http://github.com/rails/rails/commit/cdf60e46cc01e5f7b14e95a0b7d914...