github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-04 03:05:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2962 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Nicholas Seckar
2005-11-10 00:16:23 +00:00
parent 73a697c38a
commit c955f378de
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@@ -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]

2
activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
View File

@@ -47,7 +47,7 @@ module ActiveRecord
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