Permalink
Browse files

r3458@asus: jeremy | 2005-12-13 09:33:50 -0800

 Roll back [3245] on stable.  References #3116.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3296 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2670371 commit da66198fcd2163202c44d72c3a8545d49e5dd596 @jeremy jeremy committed Dec 13, 2005
Showing with 1 addition and 3 deletions.
  1. +0 −2 activerecord/CHANGELOG
  2. +1 −1 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
View
@@ -26,8 +26,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

0 comments on commit da66198

Please sign in to comment.