0
@@ -158,7 +158,14 @@ module WillPaginate::Finders
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
+      
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
       count_options
0
     end
0
   end

0
@@ -225,6 +225,24 @@ describe WillPaginate::Finders::ActiveRecord do
0
       result.should == expected
0
       result.total_entries.should == 4
0
     end
0
+    
0
+    # detect ActiveRecord 2.1
0
+    if ActiveRecord::Base.private_methods.include?('references_eager_loaded_tables?')
0
+      it "should remove :include for count" do
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
+      it "should keep :include for count when they are referenced in :conditions" do
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
   
0
   protected