Removing :include option from count query when it's possible

In http://dev.rubyonrails.org/chang... was introduced new preload query strategy for eager :includes. Now Rails Edge uses one SELECT query per table (one for model table and one for each include table) instead a monster query with joins if it's possible. This strategy automatically are not used when there are conditions for included tables or something else (I'm not ruby/rails hacker yet):

activerecord/lib/active_record/base.rb:1242

if include_associations.any? && references_eager_loaded_tables?(options)
  records = find_with_associations(options)
else
  records = find_by_sql(construct_finder_sql(options))
  if include_associations.any?
    preload_associations(records, include_associations)
  end
end

For example:

class Post < ActiveRecord::Base
  has_many :comments
end

class Comment < ActiveRecord::Base
end

Post.find :all, :include => :comments

SELECT * FROM "posts"
SELECT comments.* FROM "comments" WHERE (comments.post_id IN (1,2))

Post.find :all, :include => :comments, :conditions => "posts.id > 1"

SELECT * FROM "posts" WHERE (posts.id > 1)
SELECT comments.* FROM "comments" WHERE (comments.post_id IN (2))

Post.find :all, :include => :comments, :conditions => "comments.id" > 1

SELECT "posts"."id" AS t0_r0, "posts"."title" AS t0_r1, "posts"."created_at" AS t0_r2, "posts"."updated_at" AS t0_r3, "comments"."id" AS t1_r0, "comments"."body" AS t1_r1, "comments"."post_id" AS t1_r2, "comments"."created_at" AS t1_r3, "comments"."updated_at" AS t1_r4 FROM "posts" LEFT OUTER JOIN "comments" ON comments.post_id = posts.id WHERE (comments.id > 1)

Post.paginate, :include => :comments

are two calls with some additional params(:offset, :linit) in fact:

Post.find, :include => :comments
Post.count, :include => :comments

But count method doesn't use this eager strategy. This is logically.

When I use paginate method with :include option, count method generated by it ALWAYS are invoked with param when it doesn't need.

For example,

Post.paginate :include => :comments, :page => 1

generates queries:

SELECT * FROM "posts"
SELECT comments.* FROM "comments" WHERE (comments.post_id IN (1,2))
SELECT count(DISTINCT "posts".id) AS count_all FROM "posts" LEFT OUTER JOIN "comments" ON comments.post_id = posts.id

but, in this case, last query may be:

SELECT count(*) AS count_all FROM "posts"

Main task is modify WillPaginate::Finder::ClassMethods#wp_count for distinguishing when it should add "inlude" to "excludes" array. I can't do that. May be anybody can examine how that works in 'find' method?