Put establish_connection back in...

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@14 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
JEG2 · Nov 25, 2004 · 7ed0894 · 7ed0894
1 parent 55f2fcf
commit 7ed0894
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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}"