rails / rails fork watch download tarball
public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Search Repo: 
 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.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3245 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
jeremy (author)
Wed Dec 07 20:52:51 -0800 2005
commit  8a19d148b7ae29872c1a7314a09bb14d338fc390
tree    2ad793db5100c51af876c2bb116cf59b2b7b77cb
parent  bd9b27df8b372c6cc3eb2978e4ef95f68226cdfb
0
activerecord/CHANGELOG 
...
1
2
 
 
3
4
5
 
...
1
2
3
4
5
6
7
 
0
@@ -1,5 +1,7 @@
0
 * SVN*
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.expand_path(config[:database], RAILS_ROOT)
0
+            config[:database] = File.join(RAILS_ROOT, config[:database])
0
           end
0
         end
0
     end

Comments

    No one has commented yet.