diff options
| author | Tristan Gamilis <tristan@2suggestions.com.au> | 2015-04-07 17:50:32 +1000 |
|---|---|---|
| committer | Tristan Gamilis <tristan@2suggestions.com.au> | 2015-04-07 17:50:41 +1000 |
| commit | e0cb21f5f767606ad3ecf2db33855d27aa9f083d (patch) | |
| tree | 422ffc0969aad5e6a6b43372a29846276eec9f06 /activerecord/test/models | |
| parent | 693b333920fc2f5b74f157d46d531cd97b692006 (diff) | |
| download | rails-e0cb21f5f767606ad3ecf2db33855d27aa9f083d.tar.gz rails-e0cb21f5f767606ad3ecf2db33855d27aa9f083d.tar.bz2 rails-e0cb21f5f767606ad3ecf2db33855d27aa9f083d.zip | |
Require explicit counter_cache option for has_many
Previously has_many associations assumed a counter_cache was to be used
based on the presence of an appropriately named column. This is
inconsistent, since the inverse belongs_to association will not make
this assumption. See issues #19042 #8446.
This commit checks for the presence of the counter_cache key in the
options of either the has_many or belongs_to association as well as
ensuring that the *_count column is present.
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/categorization.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/models/post.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/test/models/categorization.rb b/activerecord/test/models/categorization.rb index 6588531de6..4cd67c970a 100644 --- a/activerecord/test/models/categorization.rb +++ b/activerecord/test/models/categorization.rb @@ -1,6 +1,6 @@ class Categorization < ActiveRecord::Base belongs_to :post - belongs_to :category + belongs_to :category, counter_cache: true belongs_to :named_category, :class_name => 'Category', :foreign_key => :named_category_name, :primary_key => :name belongs_to :author diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb index 052b1c9690..67bfe0c5f1 100644 --- a/activerecord/test/models/post.rb +++ b/activerecord/test/models/post.rb @@ -98,11 +98,11 @@ class Post < ActiveRecord::Base end end - has_many :taggings_with_delete_all, :class_name => 'Tagging', :as => :taggable, :dependent => :delete_all - has_many :taggings_with_destroy, :class_name => 'Tagging', :as => :taggable, :dependent => :destroy + has_many :taggings_with_delete_all, :class_name => 'Tagging', :as => :taggable, :dependent => :delete_all, counter_cache: :taggings_with_delete_all_count + has_many :taggings_with_destroy, :class_name => 'Tagging', :as => :taggable, :dependent => :destroy, counter_cache: :taggings_with_destroy_count - has_many :tags_with_destroy, :through => :taggings, :source => :tag, :dependent => :destroy - has_many :tags_with_nullify, :through => :taggings, :source => :tag, :dependent => :nullify + has_many :tags_with_destroy, :through => :taggings, :source => :tag, :dependent => :destroy, counter_cache: :tags_with_destroy_count + has_many :tags_with_nullify, :through => :taggings, :source => :tag, :dependent => :nullify, counter_cache: :tags_with_nullify_count has_many :misc_tags, -> { where :tags => { :name => 'Misc' } }, :through => :taggings, :source => :tag has_many :funky_tags, :through => :taggings, :source => :tag |