Active Record: fix empty? on a relation with a group clause

Fixes mislav#161, fixes mislav#167
dn365 · Sep 8, 2011 · 8ce2276 · 8ce2276
1 parent e1f4af7
commit 8ce2276
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/will_paginate/active_record.rb b/lib/will_paginate/active_record.rb
@@ -81,7 +81,12 @@ def size
       # overloaded to be pagination-aware
       def empty?
         if !loaded? and offset_value
-          count <= offset_value
+          rel_count = count
+          if rel_count.respond_to?(:size) and !rel_count.is_a?(Integer)
+            rel_count.size <= offset_value
+          else
+            rel_count <= offset_value
+          end
         else
           super
         end

diff --git a/spec/finders/active_record_spec.rb b/spec/finders/active_record_spec.rb
@@ -131,6 +131,13 @@
         topics.should_not be_empty
       }.should run_queries(1)
     end
+
+    it "support empty? for grouped queries" do
+      topics = Topic.group(:project_id).paginate :page => 1, :per_page => 3
+      lambda {
+        topics.should_not be_empty
+      }.should run_queries(1)
+    end
 
     it "overrides total_entries count with a fixed value" do
       lambda {