diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-08 04:51:18 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-08 04:51:18 +0000 |
commit | df901ce3455159f2a01d443239f33b50b5dacf4e (patch) | |
tree | 86013dec12b76a56fa4426317296d8c8d7b3cde6 /activerecord/lib | |
parent | d496db1388bd0d3f43c0c35547942fb4abb4082c (diff) | |
download | rails-df901ce3455159f2a01d443239f33b50b5dacf4e.tar.gz rails-df901ce3455159f2a01d443239f33b50b5dacf4e.tar.bz2 rails-df901ce3455159f2a01d443239f33b50b5dacf4e.zip |
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
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 44011a09fd..a20e65ca3b 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.expand_path(config[:database], RAILS_ROOT) + config[:database] = File.join(RAILS_ROOT, config[:database]) end end end |