diff options
| author | Fred Wu <ifredwu@gmail.com> | 2014-05-08 15:57:49 +1000 |
|---|---|---|
| committer | Fred Wu <ifredwu@gmail.com> | 2014-05-08 16:01:57 +1000 |
| commit | f045663dfc879b9516904255fb555f048c394b7b (patch) | |
| tree | 2cc2ef7850f5b9d62cfa37ac57abce718dd2a233 /activerecord/lib | |
| parent | d2061a224d4e99cbc0f859c50f0c35277773369e (diff) | |
| download | rails-f045663dfc879b9516904255fb555f048c394b7b.tar.gz rails-f045663dfc879b9516904255fb555f048c394b7b.tar.bz2 rails-f045663dfc879b9516904255fb555f048c394b7b.zip | |
Fixed HABTM's CollectionAssociation size
HABTM should fall back to using the normal CollectionAssociation's size calculation if the collection is not cached or loaded.
This addresses both #14913 and #14914 for master.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 0b122d2070..aeb77e2753 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -23,7 +23,7 @@ module ActiveRecord elsif loaded? target.size else - count + super end end |