0
@@ -184,21 +184,23 @@ module WillPaginate
0
         unless options[:select] and options[:select] =~ /^\s*DISTINCT\b/i
0
           excludees << :select # only exclude the select param if it doesn't begin with DISTINCT
0
         end
0
-        
0
-        # we may be in a model or an association proxy!
0
-        klass = (@owner and @reflection) ? @reflection.klass : self
0
 
0
         # count expects (almost) the same options as find
0
         count_options = options.except *excludees
0
-        
0
-        # remove :include option if it doesn't need
0
-        if count_options[:include] and !klass.send :references_eager_loaded_tables?, count_options
0
-          count_options.delete :include
0
-        end
0
 
0
         # merge the hash found in :count
0
         # this allows you to specify :select, :order, or anything else just for the count query
0
         count_options.update options[:count] if options[:count]
0
+        
0
+        # we may be in a model or an association proxy
0
+        klass = (@owner and @reflection) ? @reflection.klass : self
0
+        
0
+        # forget about includes if they are irrelevant (Rails 2.1)
0
+        if count_options[:include] and
0
+            klass.private_methods.include?('references_eager_loaded_tables?') and
0
+            !klass.send(:references_eager_loaded_tables?, count_options)
0
+          count_options.delete :include
0
+        end
0
 
0
         # we may have to scope ...
0
         counter = Proc.new { count(count_options) }

0
@@ -412,5 +412,23 @@ class FinderTest < ActiveRecordTestCase
0
       
0
       assert_equal 14, Developer.paginated_each(:page => '2') { }
0
     end
0
+
0
+    # detect ActiveRecord 2.1
0
+    if ActiveRecord::Base.private_methods.include?('references_eager_loaded_tables?')
0
+      def test_removes_irrelevant_includes_in_count
0
+        Developer.expects(:find).returns([1])
0
+        Developer.expects(:count).with({}).returns(0)
0
+
0
+        Developer.paginate :page => 1, :per_page => 1, :include => :projects
0
+      end
0
+
0
+      def test_doesnt_remove_referenced_includes_in_count
0
+        Developer.expects(:find).returns([1])
0
+        Developer.expects(:count).with({ :include => :projects, :conditions => 'projects.id > 2' }).returns(0)
0
+
0
+        Developer.paginate :page => 1, :per_page => 1,
0
+          :include => :projects, :conditions => 'projects.id > 2'
0
+      end
0
+    end
0
   end
0
 end