diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-11-18 17:32:59 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-11-19 19:09:01 -0300 |
| commit | a12bb7140fa95b4a21b7680b7a05280ccdc612d6 (patch) | |
| tree | a537c41fc1ce2a52625fc96e76ef732197a744ca /activerecord/lib | |
| parent | 72aa6f4f649a78b1cd8c7d4340fc143a782728db (diff) | |
| download | rails-a12bb7140fa95b4a21b7680b7a05280ccdc612d6.tar.gz rails-a12bb7140fa95b4a21b7680b7a05280ccdc612d6.tar.bz2 rails-a12bb7140fa95b4a21b7680b7a05280ccdc612d6.zip | |
"there is no need to store this option just for initialization" José Valim dixit.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 10 |
2 files changed, 5 insertions, 9 deletions
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 |