diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-04 14:08:43 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-04 14:08:43 -0300 |
| commit | 6636df3b778efe4900db5ae464090dffaeb73b8d (patch) | |
| tree | 430e688862f8f1fc4b445cce767dd30a531440c8 /activerecord/lib | |
| parent | 2fd8dd7feb27908d29ec57f8c5826bb95c3bd899 (diff) | |
| parent | c8e48f08d528c0e4537bf1df1adac1fa8f4f48ff (diff) | |
| download | rails-6636df3b778efe4900db5ae464090dffaeb73b8d.tar.gz rails-6636df3b778efe4900db5ae464090dffaeb73b8d.tar.bz2 rails-6636df3b778efe4900db5ae464090dffaeb73b8d.zip | |
Merge pull request #16028 from cade/fix_counter_cache_count_with_association_selects
Add `:all` argument to `count` in `reset_counters`
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/counter_cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/counter_cache.rb b/activerecord/lib/active_record/counter_cache.rb index 05c4b13016..a33c7c64a7 100644 --- a/activerecord/lib/active_record/counter_cache.rb +++ b/activerecord/lib/active_record/counter_cache.rb @@ -38,7 +38,7 @@ module ActiveRecord counter_name = reflection.counter_cache_column stmt = unscoped.where(arel_table[primary_key].eq(object.id)).arel.compile_update({ - arel_table[counter_name] => object.send(counter_association).count + arel_table[counter_name] => object.send(counter_association).count(:all) }, primary_key) connection.update stmt end |