From 300d080ada31ac297264e6abba6ca16cd2db5925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Tue, 25 Sep 2012 00:59:07 +0200
Subject: ActiveRecord::Relation#none! method.

---
 activerecord/CHANGELOG.md                                | 5 +++++
 activerecord/lib/active_record/relation/query_methods.rb | 5 +++++
 activerecord/test/cases/relation_test.rb                 | 6 ++++++
 3 files changed, 16 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 684a8736c9..f7aed090a4 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Added `#none!` method for mutating `ActiveRecord::Relation` objects to a NullRelation.
+    It acts like `#none` but modifies relation in place.
+
+    *Juanjo Bazán*
+
 *   Fix bug where `update_columns` and `update_column` would not let you update the primary key column.
 
     *Henrik Nyh*
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 14bcb337e9..4fdc296c7e 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -496,6 +496,11 @@ module ActiveRecord
       extending(NullRelation)
     end
 
+    # Like #none, but modifies relation in place.
+    def none!
+      extending!(NullRelation)
+    end
+
     # Sets readonly attributes for the returned relation. If value is
     # true (default), attempting to update a record will result in an error.
     #
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 6399111be6..98e278df82 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -256,5 +256,11 @@ module ActiveRecord
     test 'merge with a proc' do
       assert_equal [:foo], relation.merge(-> { where(:foo) }).where_values
     end
+
+    test 'none!' do
+      assert relation.none!.equal?(relation)
+      assert_equal [NullRelation], relation.extending_values
+      assert relation.is_a?(NullRelation)
+    end
   end
 end
-- 
cgit v1.2.3