diff options
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index e22498a0a5..5ae81649c5 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -29,7 +29,7 @@ module ActiveRecord def count_records count = if has_cached_counter? owner.send(:read_attribute, cached_counter_attribute_name) - elsif reflection.options[:counter_sql] || reflection.options[:finder_sql] + elsif options[:counter_sql] || options[:finder_sql] reflection.klass.count_by_sql(custom_counter_sql) else scoped.count @@ -40,7 +40,7 @@ module ActiveRecord # documented side-effect of the method that may avoid an extra SELECT. @target ||= [] and loaded! if count == 0 - [reflection.options[:limit], count].compact.min + [options[:limit], count].compact.min end def has_cached_counter?(reflection = reflection) |