提交 c955f378 编写于 作者: N Nicholas Seckar

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
上级 73a697c3
*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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册