mirror of
https://github.com/github/rails.git
synced 2026-01-27 23:38:11 -05:00
Roll back [3244]. References #3116.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3294 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -30,8 +30,6 @@
|
||||
|
||||
* MySQL: more robust test for nullified result hashes. #3124 [Stefan Kaes]
|
||||
|
||||
* SQLite: find database file when RAILS_ROOT is a symlink. #3116 [anna@wota.jp]
|
||||
|
||||
* Reloading an instance refreshes its aggregations as well as its associations. #3024 [François Beausolei]
|
||||
|
||||
* Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]
|
||||
|
||||
@@ -55,7 +55,7 @@ module ActiveRecord
|
||||
# the database path is not the special path that tells
|
||||
# Sqlite build a database only in memory.
|
||||
if Object.const_defined?(:RAILS_ROOT) && ':memory:' != config[:database]
|
||||
config[:database] = File.join(RAILS_ROOT, config[:database])
|
||||
config[:database] = File.expand_path(config[:database], RAILS_ROOT)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user