mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Put establish_connection back in... 

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@14 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2004-11-25 22:34:24 +00:00
parent 55f2fcff1d
commit 7ed0894c37
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
railties/environments/shared.rb
View File

@ -37,8 +37,9 @@ require 'action_mailer'
# Environment-specific configuration.
require 'yaml'
ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
ActiveRecord::Base.establish_connection
ActionController::Base.require_or_load 'abstract_application'
ActionController::Base.require_or_load "environments/#{RAILS_ENV}"
@ -52,5 +53,4 @@ end
klass.template_root ||= "#{RAILS_ROOT}/app/views/"
end
# Include your app's configuration here:

3
railties/environments/shared_for_gem.rb
View File

@ -33,8 +33,9 @@ require_gem 'rails'
# Environment-specific configuration.
require 'yaml'
ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
ActiveRecord::Base.establish_connection
ActionController::Base.require_or_load 'abstract_application'
ActionController::Base.require_or_load "environments/#{RAILS_ENV}"