diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 6 |
1 files changed, 5 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 5b0ac25d17..31b8ac6b9e 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -92,13 +92,17 @@ module ActiveRecord end def count_records - if has_cached_counter? + count = if has_cached_counter? @owner.send(:read_attribute, cached_counter_attribute_name) elsif @options[:counter_sql] @association_class.count_by_sql(@counter_sql) else @association_class.count(@counter_sql) end + + @target = [] and loaded if count == 0 + + return count end def has_cached_counter? |