提交 7ed0894c 编写于 作者: D David Heinemeier Hansson

Put establish_connection back in...

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@14 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 55f2fcff
...@@ -37,8 +37,9 @@ ...@@ -37,8 +37,9 @@
# Environment-specific configuration. # Environment-specific configuration.
require 'yaml'
ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml")) 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 'abstract_application'
ActionController::Base.require_or_load "environments/#{RAILS_ENV}" ActionController::Base.require_or_load "environments/#{RAILS_ENV}"
...@@ -52,5 +53,4 @@ ...@@ -52,5 +53,4 @@
klass.template_root ||= "#{RAILS_ROOT}/app/views/" klass.template_root ||= "#{RAILS_ROOT}/app/views/"
end end
# Include your app's configuration here: # Include your app's configuration here:
...@@ -33,8 +33,9 @@ ...@@ -33,8 +33,9 @@
# Environment-specific configuration. # Environment-specific configuration.
require 'yaml'
ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml")) 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 'abstract_application'
ActionController::Base.require_or_load "environments/#{RAILS_ENV}" ActionController::Base.require_or_load "environments/#{RAILS_ENV}"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册