aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-18 16:01:32 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-18 16:01:32 -0300
commit051747449e7afc817c599e4135bc629d4de064eb (patch)
tree724cd9c1e5041a90b0362466ff442569f271a748 /activerecord/lib/active_record/core.rb
parentfda195d34af3cd89cf2f3de3ed653f157c76730b (diff)
parent14fc8b34521f8354a17e50cd11fa3f809e423592 (diff)
downloadrails-051747449e7afc817c599e4135bc629d4de064eb.tar.gz
rails-051747449e7afc817c599e4135bc629d4de064eb.tar.bz2
rails-051747449e7afc817c599e4135bc629d4de064eb.zip
Merge pull request #6743 from steveklabnik/remove_composed_of
Removing composed_of
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r--activerecord/lib/active_record/core.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index f5d60d11b6..90f156456e 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -266,7 +266,6 @@ module ActiveRecord
@changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
end
- @aggregation_cache = {}
@association_cache = {}
@attributes_cache = {}
@@ -391,7 +390,6 @@ module ActiveRecord
@attributes[pk] = nil unless @attributes.key?(pk)
- @aggregation_cache = {}
@association_cache = {}
@attributes_cache = {}
@previously_changed = {}