aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_many_association.rb
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2014-05-24 14:03:30 -0400
committerArthur Neves <arthurnn@gmail.com>2014-05-24 14:55:20 -0400
commit09ac448a8eff73ffb7a3f683207802e8cb1f6d0b (patch)
tree668528eedc99f79d91431c7b7dd6acccd42d5221 /activerecord/lib/active_record/associations/has_many_association.rb
parente2bd0eb758100a5d6f55201318809a7ed7b37040 (diff)
downloadrails-09ac448a8eff73ffb7a3f683207802e8cb1f6d0b.tar.gz
rails-09ac448a8eff73ffb7a3f683207802e8cb1f6d0b.tar.bz2
rails-09ac448a8eff73ffb7a3f683207802e8cb1f6d0b.zip
Merge pull request #15210 from arthurnn/fix_hbtm_reflection
Fix habtm reflection Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/reflection_test.rb
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_many_association.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index f5e911c739..2727e23870 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -100,7 +100,8 @@ module ActiveRecord
# Hence this method.
def inverse_updates_counter_cache?(reflection = reflection())
counter_name = cached_counter_attribute_name(reflection)
- reflection.klass.reflect_on_all_associations(:belongs_to).any? { |inverse_reflection|
+ reflection.klass._reflections.values.any? { |inverse_reflection|
+ :belongs_to == inverse_reflection.macro &&
inverse_reflection.counter_cache_column == counter_name
}
end