Permalink
Browse files

Put establish_connection back in...

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@14 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 55f2fcf commit 7ed0894c37a0222eaaa256cc9be19647c108e432 @dhh dhh committed Nov 25, 2004
Showing with 4 additions and 3 deletions.
  1. +2 −2 railties/environments/shared.rb
  2. +2 −1 railties/environments/shared_for_gem.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:
@@ -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}"

0 comments on commit 7ed0894

Please sign in to comment.