From df901ce3455159f2a01d443239f33b50b5dacf4e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 8 Dec 2005 04:51:18 +0000 Subject: 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 --- activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') 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 -- cgit v1.2.3