aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-12-08 04:51:18 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-12-08 04:51:18 +0000
commitdf901ce3455159f2a01d443239f33b50b5dacf4e (patch)
tree86013dec12b76a56fa4426317296d8c8d7b3cde6
parentd496db1388bd0d3f43c0c35547942fb4abb4082c (diff)
downloadrails-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
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 359e14619f..d5fe3745b5 100644
--- a/activerecord/CHANGELOG
+++ b/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]
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