activerecord 4.2.11 → 5.2.4.1

data/lib/active_record/no_touching.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   # = Active Record No Touching
   module NoTouching
     extend ActiveSupport::Concern
 
     module ClassMethods
-      # Lets you selectively disable calls to `touch` for the
+      # Lets you selectively disable calls to +touch+ for the
       # duration of a block.
       #
       # ==== Examples
@@ -45,6 +47,10 @@ module ActiveRecord
       NoTouching.applied_to?(self.class)
     end
 
+    def touch_later(*) # :nodoc:
+      super unless no_touching?
+    end
+
     def touch(*) # :nodoc:
       super unless no_touching?
     end

data/lib/active_record/null_relation.rb

@@ -1,20 +1,16 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module ActiveRecord
   module NullRelation # :nodoc:
-    def exec_queries
-      @records = []
-    end
-
     def pluck(*column_names)
       []
     end
 
-    def delete_all(_conditions = nil)
+    def delete_all
       0
     end
 
-    def update_all(_updates, _conditions = nil, _options = {})
+    def update_all(_updates)
       0
     end
 
@@ -22,11 +18,11 @@ module ActiveRecord
       0
     end
 
-    def size
-      calculate :size, nil
+    def empty?
+      true
     end
 
-    def empty?
+    def none?
       true
     end
 
@@ -34,6 +30,10 @@ module ActiveRecord
       false
     end
 
+    def one?
+      false
+    end
+
     def many?
       false
     end
@@ -42,40 +42,27 @@ module ActiveRecord
       ""
     end
 
-    def count(*)
-      calculate :count, nil
-    end
-
-    def sum(*)
-      calculate :sum, nil
+    def calculate(operation, _column_name)
+      case operation
+      when :count, :sum
+        group_values.any? ? Hash.new : 0
+      when :average, :minimum, :maximum
+        group_values.any? ? Hash.new : nil
+      end
     end
 
-    def average(*)
-      calculate :average, nil
+    def exists?(_conditions = :none)
+      false
     end
 
-    def minimum(*)
-      calculate :minimum, nil
+    def or(other)
+      other.spawn
     end
 
-    def maximum(*)
-      calculate :maximum, nil
-    end
+    private
 
-    def calculate(operation, _column_name, _options = {})
-      # TODO: Remove _options argument as soon we remove support to
-      # activerecord-deprecated_finders.
-      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
+      def exec_queries
+        @records = [].freeze
       end
-    end
-
-    def exists?(_id = false)
-      false
-    end
   end
 end