提交 4ac2593e 编写于 作者: J Jeremy Kemper

Roll back [3244]. References #3116.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3294 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 224d47e0
......@@ -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 @@ def parse_config!(config)
# 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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册