diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-08-01 18:15:52 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-08-01 18:22:12 -0700 |
| commit | cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1 (patch) | |
| tree | abd1178ddad1883668cd1ea59642b062f113f4b4 /activerecord | |
| parent | 62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff) | |
| download | rails-cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1.tar.gz rails-cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1.tar.bz2 rails-cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1.zip | |
SQLite: drop support for 'dbfile' option in favor of 'database.'
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 659de99873..5515cf6b1a 100644 --- a/activerecord/CHANGELOG +++ b/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' diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 5e5e30776a..c0f5046bff 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -27,7 +27,6 @@ module ActiveRecord private def parse_sqlite_config!(config) - config[:database] ||= config[:dbfile] # Require database. unless config[:database] raise ArgumentError, "No database file specified. Missing argument: database" |