From a12bb7140fa95b4a21b7680b7a05280ccdc612d6 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Thu, 18 Nov 2010 17:32:59 -0300 Subject: =?UTF-8?q?"there=20is=20no=20need=20to=20store=20this=20option=20?= =?UTF-8?q?just=20for=20initialization"=20Jos=C3=A9=20Valim=20dixit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activerecord/lib/active_record/base.rb | 4 ---- activerecord/lib/active_record/railtie.rb | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index dd79a6e8d9..2b8474b6bf 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -411,10 +411,6 @@ module ActiveRecord #:nodoc: class_attribute :store_full_sti_class self.store_full_sti_class = true - # Determine whether or not to use IdentityMap. - class_attribute :identity_map - self.identity_map = false - # Stores the default scope for the class class_inheritable_accessor :default_scoping, :instance_writer => false self.default_scoping = [] diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 346ae63a08..9ffc3501c5 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -43,6 +43,11 @@ module ActiveRecord ActiveSupport.on_load(:active_record) { self.logger ||= ::Rails.logger } end + initializer "active_record.identity_map" do |app| + config.app_middleware.insert_after "::ActionDispatch::Callbacks", + "ActiveRecord::IdentityMap::Middleware" if config.active_record.delete(:identity_map) + end + initializer "active_record.set_configs" do |app| ActiveSupport.on_load(:active_record) do app.config.active_record.each do |k,v| @@ -78,11 +83,6 @@ module ActiveRecord end end - initializer "active_record.identity_map" do |app| - config.app_middleware.insert_after "::ActionDispatch::Callbacks", - "ActiveRecord::IdentityMap::Middleware" if config.active_record.identity_map - end - config.after_initialize do ActiveSupport.on_load(:active_record) do instantiate_observers -- cgit v1.2.3