aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-08-01 18:15:52 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-08-01 18:22:12 -0700
commitcdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1 (patch)
treeabd1178ddad1883668cd1ea59642b062f113f4b4 /activerecord/lib/active_record/connection_adapters
parent62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff)
downloadrails-cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1.tar.gz
rails-cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1.tar.bz2
rails-cdf60e46cc01e5f7b14e95a0b7d914516fcdcbc1.zip
SQLite: drop support for 'dbfile' option in favor of 'database.'
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb1
1 files changed, 0 insertions, 1 deletions
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"