From a2e607e1055dcede27970ccd7f5b89a1ddee8c32 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Fri, 10 May 2013 20:45:09 +0200
Subject: Make NullRelation a bit more like a real relation by returning 0 for
 #calculate(:count)

---
 activerecord/lib/active_record/null_relation.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/null_relation.rb')

diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb
index 5d801fa705..d166f0dd66 100644
--- a/activerecord/lib/active_record/null_relation.rb
+++ b/activerecord/lib/active_record/null_relation.rb
@@ -55,7 +55,11 @@ module ActiveRecord
     end
 
     def calculate(_operation, _column_name, _options = {})
-      nil
+      if _operation == :count
+        0
+      else
+        nil
+      end
     end
 
     def exists?(_id = false)
-- 
cgit v1.2.3