aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-30 08:10:04 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-30 08:10:04 +0000
commitc21fdf31a52cbe507ff675815c29e5eef39e0bbb (patch)
treee782c60828c1632273e04aacfb197805c74b4b44 /activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
parentea44527afd55b568be3a07cb0d4991242474db03 (diff)
downloadrails-c21fdf31a52cbe507ff675815c29e5eef39e0bbb.tar.gz
rails-c21fdf31a52cbe507ff675815c29e5eef39e0bbb.tar.bz2
rails-c21fdf31a52cbe507ff675815c29e5eef39e0bbb.zip
Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) (closes #2644) [Dan Peterson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2825 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index 7858d08b66..a20304ea62 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -27,13 +27,13 @@ module ActiveRecord
#
# ActiveRecord::Base.establish_connection(
# :adapter => "sqlite",
- # :dbfile => "path/to/dbfile"
+ # :database => "path/to/dbfile"
# )
#
# Also accepts keys as strings (for parsing from yaml for example):
# ActiveRecord::Base.establish_connection(
# "adapter" => "sqlite",
- # "dbfile" => "path/to/dbfile"
+ # "database" => "path/to/dbfile"
# )
#
# The exceptions AdapterNotSpecified, AdapterNotFound and ArgumentError