github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 16:28:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't load observers if Active Record isn't loaded.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2007-05-23 07:05:51 +00:00
parent a11374ad5a
commit f78a1948d2
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
railties/lib/initializer.rb
View File

@@ -216,7 +216,9 @@ module Rails
end
def load_observers
ActiveRecord::Base.instantiate_observers
if configuration.frameworks.include?(:active_record)
ActiveRecord::Base.instantiate_observers
end
end
# This initialzation sets $KCODE to 'u' to enable the multibyte safe operations.
@@ -231,9 +233,10 @@ module Rails
# this sets the database configuration from Configuration#database_configuration
# and then establishes the connection.
def initialize_database
return unless configuration.frameworks.include?(:active_record)
ActiveRecord::Base.configurations = configuration.database_configuration
ActiveRecord::Base.establish_connection
if configuration.frameworks.include?(:active_record)
ActiveRecord::Base.configurations = configuration.database_configuration
ActiveRecord::Base.establish_connection
end
end
# If the +RAILS_DEFAULT_LOGGER+ constant is already set, this initialization
@@ -690,4 +693,4 @@ class Rails::OrderedOptions < Array #:nodoc:
self.each { |i| return i if i.first == key }
return false
end
end
end