From 4ac2593e4e6e7bb5abbea66fea933ee209701c78 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 13 Dec 2005 17:32:39 +0000 Subject: [PATCH] Roll back [3244]. References #3116. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3294 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 -- .../lib/active_record/connection_adapters/sqlite_adapter.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 91f96b4c31f6a..df060b1c6dc68 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -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] diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index a20e65ca3bd38..44011a09fd01a 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/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.join(RAILS_ROOT, config[:database]) + config[:database] = File.expand_path(config[:database], RAILS_ROOT) end end end