Permalink
Browse files

SQLite: drop support for 'dbfile' option in favor of 'database.'

  • Loading branch information...
1 parent 62fd1d3 commit cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1 @jeremy jeremy committed Aug 2, 2009
Showing with 2 additions and 1 deletion.
  1. +2 −0 activerecord/CHANGELOG
  2. +0 −1 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
View
2 activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*Edge*
+* SQLite: drop support for 'dbfile' option in favor of 'database.' #2363 [Paul Hinze, Jeremy Kemper]
+
* Added :primary_key option to belongs_to associations. #765 [Szymon Nowak, Philip Hallstrom, Noel Rocha]
# employees.company_name references companies.name
Employee.belongs_to :company, :primary_key => 'name', :foreign_key => 'company_name'
View
1 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -27,7 +27,6 @@ def sqlite_connection(config) # :nodoc:
private
def parse_sqlite_config!(config)
- config[:database] ||= config[:dbfile]
# Require database.
unless config[:database]
raise ArgumentError, "No database file specified. Missing argument: database"

0 comments on commit cdf60e4

Please sign in to comment.