diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 22:19:48 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 22:19:48 +0000 |
| commit | df9276e8b9a64a08bd294361e8c56b50182d2663 (patch) | |
| tree | 0dc9786b646b19cdb829f3bf07c1a7ad69ba01b6 /activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | |
| parent | 1f9243c13e5e91ecbca3628f6c801c06957354e2 (diff) | |
| download | rails-df9276e8b9a64a08bd294361e8c56b50182d2663.tar.gz rails-df9276e8b9a64a08bd294361e8c56b50182d2663.tar.bz2 rails-df9276e8b9a64a08bd294361e8c56b50182d2663.zip | |
Fixed that every successive call on the sqlite adapter prepended RAILS_ROOT again and again because RAILS_ROOT itself is the Windows absolute path which begins with the drive letter #294
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@139 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
| -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 afe545b313..8a77cb0ce7 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -13,7 +13,7 @@ module ActiveRecord raise ArgumentError, "No database file specified. Missing argument: dbfile" end - config[:dbfile] = File.join(RAILS_ROOT, config[:dbfile]) if config[:dbfile] =~ /^\w/ && Object.const_defined?(:RAILS_ROOT) + config[:dbfile] = File.expand_path(config[:dbfile], RAILS_ROOT) if Object.const_defined?(:RAILS_ROOT) db = SQLite::Database.new(config[:dbfile], 0) db.show_datatypes = "ON" if !defined? SQLite::Version |