Permalink
Browse files

r3389@asus: jeremy | 2005-12-07 20:52:39 -0800

 Apply [3244] to stable.  SQLite: find database file when RAILS_ROOT is a symlink.  Closes #3116.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3245 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent bd9b27d commit 8a19d148b7ae29872c1a7314a09bb14d338fc390 @jeremy jeremy committed Dec 8, 2005
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
2 activerecord/CHANGELOG
@@ -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]
View
2 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -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 8a19d14

Please sign in to comment.