diff options
author | Michael Koziarski <michael@koziarski.com> | 2007-08-16 04:37:31 +0000 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2007-08-16 04:37:31 +0000 |
commit | f008566d656fb3b86c6421520ffcd05828a2108f (patch) | |
tree | 0d4e1782a3dfc21fc628b34425da9921b6da5774 /activerecord/lib/active_record | |
parent | 82b244e3ffb55b94597b0562919522625ebfd2d3 (diff) | |
download | rails-f008566d656fb3b86c6421520ffcd05828a2108f.tar.gz rails-f008566d656fb3b86c6421520ffcd05828a2108f.tar.bz2 rails-f008566d656fb3b86c6421520ffcd05828a2108f.zip |
Don't clobber :includes passed to count on has_many association. Closes #9175 [danger]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7326 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-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 c40982d738..d385691967 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -31,7 +31,7 @@ module ActiveRecord options[:conditions] = options[:conditions].nil? ? @finder_sql : @finder_sql + " AND (#{sanitize_sql(options[:conditions])})" - options[:include] = @reflection.options[:include] + options[:include] ||= @reflection.options[:include] @reflection.klass.count(column_name, options) end |