提交 5aa58cc0 编写于 作者: M Michael Koziarski

Split the observer railtie into two phases.

Observers observing models with scopes defined will require the connection to be established.
上级 0ea434e2
...@@ -70,9 +70,7 @@ class Railtie < Rails::Railtie ...@@ -70,9 +70,7 @@ class Railtie < Rails::Railtie
end end
end end
initializer "active_record.load_observers" do initializer "active_record.add_observer_hook", :after=>"active_record.set_configs" do |app|
ActiveSupport.on_load(:active_record) { instantiate_observers }
ActiveSupport.on_load(:active_record) do ActiveSupport.on_load(:active_record) do
ActionDispatch::Callbacks.to_prepare(:activerecord_instantiate_observers) do ActionDispatch::Callbacks.to_prepare(:activerecord_instantiate_observers) do
ActiveRecord::Base.instantiate_observers ActiveRecord::Base.instantiate_observers
...@@ -80,6 +78,12 @@ class Railtie < Rails::Railtie ...@@ -80,6 +78,12 @@ class Railtie < Rails::Railtie
end end
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| initializer "active_record.set_dispatch_hooks", :before => :set_clear_dependencies_hook do |app|
ActiveSupport.on_load(:active_record) do ActiveSupport.on_load(:active_record) do
unless app.config.cache_classes unless app.config.cache_classes
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册