diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-08-16 04:36:55 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-08-16 04:36:55 +0000 |
| commit | 82b244e3ffb55b94597b0562919522625ebfd2d3 (patch) | |
| tree | 414af9327b68002ad43af344ce6af46bbaa2acc8 /activerecord/lib | |
| parent | 4954c77b69fcc6d3e7299682c010f0b7b44c54c3 (diff) | |
| download | rails-82b244e3ffb55b94597b0562919522625ebfd2d3.tar.gz rails-82b244e3ffb55b94597b0562919522625ebfd2d3.tar.bz2 rails-82b244e3ffb55b94597b0562919522625ebfd2d3.zip | |
Make sure has_many associations honour :include when counting. Closes #9167 [danger]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7325 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 |
1 files changed, 1 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 838eb00863..c40982d738 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -99,7 +99,7 @@ module ActiveRecord elsif @reflection.options[:counter_sql] @reflection.klass.count_by_sql(@counter_sql) else - @reflection.klass.count(:conditions => @counter_sql) + @reflection.klass.count(:conditions => @counter_sql, :include => @reflection.options[:include]) end @target = [] and loaded if count == 0 |