Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Roll back [3244]. References #3116.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3294 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
jeremy committed Dec 13, 2005
1 parent 224d47e commit 4ac2593
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions activerecord/CHANGELOG
Expand Up @@ -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]
Expand Down
Expand Up @@ -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
Expand Down

0 comments on commit 4ac2593

Please sign in to comment.