Merge pull request #6579 from amatsuda/null_relation_modulize

modulize AR::NullRelation

2 files changed, 9 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb
index c2d3eeb8ce..aca8291d75 100644
--- a/activerecord/lib/active_record/null_relation.rb
+++ b/activerecord/lib/active_record/null_relation.rb
@@ -2,24 +2,24 @@
 
 module ActiveRecord
   # = Active Record Null Relation
-  class NullRelation < Relation
+  module NullRelation
     def exec_queries
       @records = []
     end
 
-    def pluck(column_name)
+    def pluck(_column_name)
       []
     end
 
-    def delete_all(conditions = nil)
+    def delete_all(_conditions = nil)
       0
     end
 
-    def update_all(updates, conditions = nil, options = {})
+    def update_all(_updates, _conditions = nil, _options = {})
       0
     end
 
-    def delete(id_or_array)
+    def delete(_id_or_array)
       0
     end
 
@@ -51,13 +51,12 @@ module ActiveRecord
       0
     end
 
-    def calculate(operation, column_name, options = {})
+    def calculate(_operation, _column_name, _options = {})
       nil
     end
 
-    def exists?(id = false)
+    def exists?(_id = false)
       false
     end
-
   end
-end
\ No newline at end of file
+end
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 19fe8155d9..a89d0f3ebf 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -279,7 +279,7 @@ module ActiveRecord
     #   end
     #
     def none
-      NullRelation.new(@klass, @table)
+      scoped.extending(NullRelation)
     end
 
     def readonly(value = true)