1 files changed, 20 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb
index 5b255c3fe5..b406da14dc 100644
--- a/activerecord/lib/active_record/null_relation.rb
+++ b/activerecord/lib/active_record/null_relation.rb
@@ -23,7 +23,7 @@ module ActiveRecord
     end
 
     def size
-      0
+      calculate :size, nil
     end
 
     def empty?
@@ -43,18 +43,30 @@ module ActiveRecord
     end
 
     def count(*)
-      0
+      calculate :count, nil
     end
 
     def sum(*)
-      0
+      calculate :sum, nil
+    end
+
+    def average(*)
+      calculate :average, nil
+    end
+
+    def minimum(*)
+      calculate :minimum, nil
+    end
+
+    def maximum(*)
+      calculate :maximum, nil
     end
 
-    def calculate(operation, _column_name, _options = {})
-      # TODO: Remove _options argument as soon we remove support to
-      # activerecord-deprecated_finders.
-      if operation == :count
-        0
+    def calculate(operation, _column_name)
+      if [:count, :sum, :size].include? operation
+        group_values.any? ? Hash.new : 0
+      elsif [:average, :minimum, :maximum].include?(operation) && group_values.any?
+        Hash.new
       else
         nil
       end