Permalink
Browse files

Fix sqlite adaptor's detection of missing dbfile or database declaration

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2962 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 73a697c commit c955f378de859bf433fc56d877050efa5d11c691 @seckar seckar committed Nov 10, 2005
Showing with 3 additions and 1 deletion.
  1. +2 −0 activerecord/CHANGELOG
  2. +1 −1 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -1,5 +1,7 @@
*SVN*
+* Fix sqlite adaptor's detection of missing dbfile or database declaration. [Nicholas Seckar]
+
* Fixed acts_as_list for definitions without an explicit :order #2803 [jonathan@bluewire.net.nz]
* Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql 0.2.6 with a patchset for 4.1 protocol support. Local change [301] is now a part of the main driver; reapplied local change [2182]. Removed GC.start from Result.free. [tommy@tmtm.org, akuroda@gmail.com, Doug Fales <doug.fales@gmail.com>, Jeremy Kemper]
@@ -47,7 +47,7 @@ def sqlite_connection(config) # :nodoc:
def parse_config!(config)
config[:database] ||= config[:dbfile]
# Require database.
- unless config.has_key?(:database)
+ unless config[:database]
raise ArgumentError, "No database file specified. Missing argument: database"
end

0 comments on commit c955f37

Please sign in to comment.