diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-13 17:32:39 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-13 17:32:39 +0000 |
| commit | 4ac2593e4e6e7bb5abbea66fea933ee209701c78 (patch) | |
| tree | 3791cab5a81149e2182582f8b40ad260d8f7d0f0 | |
| parent | 224d47e0a38167a92b37cc92a10ecaa97ede4a1d (diff) | |
| download | rails-4ac2593e4e6e7bb5abbea66fea933ee209701c78.tar.gz rails-4ac2593e4e6e7bb5abbea66fea933ee209701c78.tar.bz2 rails-4ac2593e4e6e7bb5abbea66fea933ee209701c78.zip | |
Roll back [3244]. References #3116.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3294 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 91f96b4c31..df060b1c6d 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 a20e65ca3b..44011a09fd 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 @@ module ActiveRecord # 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 |