Skip to content
This repository
Browse code

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

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

0 notes on commit cdf60e4

Please sign in to comment.
Something went wrong with that request. Please try again.