Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 3245

Show
Ignore:
Timestamp:
12/08/05 04:52:51 (3 years ago)
Author:
bitsweat
Message:

r3389@asus: jeremy | 2005-12-07 20:52:39 -0800
Apply [3244] to stable. SQLite: find database file when RAILS_ROOT is a symlink. Closes #3116.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/stable/activerecord/CHANGELOG

    r3243 r3245  
    11* SVN* 
     2 
     3* SQLite: find database file when RAILS_ROOT is a symlink.  #3116 [anna@wota.jp] 
    24 
    35* Reloading an instance refreshes its aggregations as well as its associations.  #3024 [François Beausolei] 
  • branches/stable/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

    r3177 r3245  
    5656          # Sqlite build a database only in memory. 
    5757          if Object.const_defined?(:RAILS_ROOT) && ':memory:' != config[:database] 
    58             config[:database] = File.expand_path(config[:database], RAILS_ROOT
     58            config[:database] = File.join(RAILS_ROOT, config[:database]
    5959          end 
    6060        end