mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Split the observer railtie into two phases.
Observers observing models with scopes defined will require the connection to be established.
This commit is contained in:
@@ -70,9 +70,7 @@ module ActiveRecord
|
||||
end
|
||||
end
|
||||
|
||||
initializer "active_record.load_observers" do
|
||||
ActiveSupport.on_load(:active_record) { instantiate_observers }
|
||||
|
||||
initializer "active_record.add_observer_hook", :after=>"active_record.set_configs" do |app|
|
||||
ActiveSupport.on_load(:active_record) do
|
||||
ActionDispatch::Callbacks.to_prepare(:activerecord_instantiate_observers) do
|
||||
ActiveRecord::Base.instantiate_observers
|
||||
@@ -80,6 +78,12 @@ module ActiveRecord
|
||||
end
|
||||
end
|
||||
|
||||
initializer "active_record.instantiate_observers", :after=>"active_record.initialize_database" do
|
||||
ActiveSupport.on_load(:active_record) do
|
||||
instantiate_observers
|
||||
end
|
||||
end
|
||||
|
||||
initializer "active_record.set_dispatch_hooks", :before => :set_clear_dependencies_hook do |app|
|
||||
ActiveSupport.on_load(:active_record) do
|
||||
unless app.config.cache_classes
|
||||
|
||||
Reference in New Issue
Block a user