mirror of https://github.com/rails/rails
Added relative path search for sqlite dbfiles in database.yml (if RAILS_ROOT is defined) #233 [bitsweat]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@34 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
d6d875bfb4
commit
bc80460115
|
@ -1,5 +1,7 @@
|
|||
*CVS*
|
||||
|
||||
* Added relative path search for sqlite dbfiles in database.yml (if RAILS_ROOT is defined) #233 [bitsweat]
|
||||
|
||||
* Added option to establish_connection where you'll be able to leave out the parameter to have it use the RAILS_ENV environment variable
|
||||
|
||||
* Added ADO-based SQLServerAdapter (only works on Windows) [Joey Gibson]
|
||||
|
|
|
@ -12,7 +12,8 @@ module ActiveRecord
|
|||
unless config.has_key?(:dbfile)
|
||||
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)
|
||||
db = SQLite::Database.new(config[:dbfile], 0)
|
||||
|
||||
db.show_datatypes = "ON" if !defined? SQLite::Version
|
||||
|
@ -102,4 +103,4 @@ module ActiveRecord
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue