From fa84a4d7c1ae1462c63502a228db0101a92f6ab0 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Fri, 29 Jul 2016 22:49:47 +0900
Subject: Remove unnecessary methods for `NullRelation`

---
 activerecord/lib/active_record/null_relation.rb | 36 +++++--------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb
index 1ab4e0404f..254550c378 100644
--- a/activerecord/lib/active_record/null_relation.rb
+++ b/activerecord/lib/active_record/null_relation.rb
@@ -1,9 +1,5 @@
 module ActiveRecord
   module NullRelation # :nodoc:
-    def exec_queries
-      @records = [].freeze
-    end
-
     def pluck(*column_names)
       []
     end
@@ -20,10 +16,6 @@ module ActiveRecord
       0
     end
 
-    def size
-      calculate :size, nil
-    end
-
     def empty?
       true
     end
@@ -48,28 +40,8 @@ module ActiveRecord
       ""
     end
 
-    def count(*)
-      calculate :count, nil
-    end
-
-    def sum(*)
-      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)
-      if [:count, :sum, :size].include? operation
+      if [:count, :sum].include? operation
         group_values.any? ? Hash.new : 0
       elsif [:average, :minimum, :maximum].include?(operation) && group_values.any?
         Hash.new
@@ -85,5 +57,11 @@ module ActiveRecord
     def or(other)
       other.spawn
     end
+
+    private
+
+      def exec_queries
+        @records = [].freeze
+      end
   end
 end
-- 
cgit v1.2.3