JackDanger / rails fork watch download tarball
public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/JackDanger/rails.git 
 r3458@asus:  jeremy | 2005-12-13 09:33:50 -0800
 Roll back [3245] on stable.  References #3116.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3296 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
jeremy (author)
Tue Dec 13 09:34:09 -0800 2005
commit  da66198fcd2163202c44d72c3a8545d49e5dd596
tree    596190ec0c453fb337234e07070a798fbc06249f
parent  2670371690cc2a00ded62a636d0bb706013c25a0
0
activerecord/CHANGELOG 
...
26
27
28
29
30
31
32
33
 
...
26
27
28
 
 
29
30
31
 
0
@@ -26,8 +26,6 @@
0
 
0
 * MySQL: more robust test for nullified result hashes.  #3124 [Stefan Kaes]
0
 
0
-* SQLite: find database file when RAILS_ROOT is a symlink.  #3116 [anna@wota.jp]
0
-
0
 * Reloading an instance refreshes its aggregations as well as its associations.  #3024 [François Beausolei]
0
 
0
 * Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]
0
activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb 
...
55
56
57
58
 
59
60
61
 
...
55
56
57
 
58
59
60
61
 
0
@@ -55,7 +55,7 @@ module ActiveRecord
0
           # the database path is not the special path that tells
0
           # Sqlite build a database only in memory.
0
           if Object.const_defined?(:RAILS_ROOT) && ':memory:' != config[:database]
0
-            config[:database] = File.join(RAILS_ROOT, config[:database])
0
+            config[:database] = File.expand_path(config[:database], RAILS_ROOT)
0
           end
0
         end
0
     end

Comments

    No one has commented yet.