Permalink
Browse files

SQLite: find database file when RAILS_ROOT is a symlink. References #…

…3116.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3244 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed Dec 8, 2005
1 parent d496db1 commit df901ce3455159f2a01d443239f33b50b5dacf4e
Showing with 3 additions and 1 deletion.
  1. +2 −0 activerecord/CHANGELOG
  2. +1 −1 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
View
@@ -1,5 +1,7 @@
*SVN*
* 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.expand_path(config[:database], RAILS_ROOT)
config[:database] = File.join(RAILS_ROOT, config[:database])
end
end
end

0 comments on commit df901ce

Please sign in to comment.