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:
parent
55f2fcff1d
commit
7ed0894c37
@ -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 @@
|
|||||||
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 @@
|
|||||||
|
|
||||||
|
|
||||||
# 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}"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user