Skip to content
Browse files

SQLite: deprecate the 'dbfile' option in favor of 'database.'

  • Loading branch information...
1 parent d37ac79 commit 32cfd4c2f8cebf3dd331b2f830a268dbf637adf3 @jeremy jeremy committed Aug 1, 2009
Showing with 9 additions and 0 deletions.
  1. +5 −0 activerecord/CHANGELOG
  2. +4 −0 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
View
5 activerecord/CHANGELOG
@@ -1,3 +1,8 @@
+*2.3.4 (pending)*
+
+* SQLite: deprecate the 'dbfile' option in favor of 'database.' #2363 [Paul Hinze, Jeremy Kemper]
+
+
*2.3.3 (July 12, 2009)*
* Added :primary_key option to belongs_to associations. #765 [Szymon Nowak, Philip Hallstrom, Noel Rocha]
View
4 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -27,6 +27,10 @@ def sqlite_connection(config) # :nodoc:
private
def parse_sqlite_config!(config)
+ if config.include?(:dbfile)
+ ActiveSupport::Deprecation.warn "Please update config/database.yml to use 'database' instead of 'dbfile'"
+ end
+
config[:database] ||= config[:dbfile]
# Require database.
unless config[:database]

0 comments on commit 32cfd4c

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