From 7ed0894c37a0222eaaa256cc9be19647c108e432 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 25 Nov 2004 22:34:24 +0000 Subject: [PATCH] Put establish_connection back in... git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@14 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/environments/shared.rb | 4 ++-- railties/environments/shared_for_gem.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb index 985d06ebe9..78628341e8 100644 --- a/railties/environments/shared.rb +++ b/railties/environments/shared.rb @@ -37,8 +37,9 @@ # 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 @@ klass.template_root ||= "#{RAILS_ROOT}/app/views/" end - # Include your app's configuration here: diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb index 52f618563c..dde6a01db7 100644 --- a/railties/environments/shared_for_gem.rb +++ b/railties/environments/shared_for_gem.rb @@ -33,8 +33,9 @@ # 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}" -- GitLab