From b71e08f8ba0447971553452a00917d00020edd35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 6 Feb 2015 17:50:45 -0200
Subject: [PATCH] Raise ArgumentError when passing nil to Relation#merge

nil or false should not be valid argument to the merge method.

Closes #12264
---
 activerecord/CHANGELOG.md                        |  7 +++++++
 .../lib/active_record/relation/spawn_methods.rb  |  2 +-
 activerecord/test/cases/relation_test.rb         | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 5ca93b3cd3..46d10d5bff 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Raise `ArgumentError` when passing `nil` or `false` to `Relation#merge`.
+
+    These are not valid values to merge in a relation so it should warn the users
+    early.
+
+    *Rafael Mendonça França*
+
 *   Use `SCHEMA` instead of `DB_STRUCTURE` for specifiying structure file.
 
     This makes the db:structure tasks consistent with test:load_structure.
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index dd3610d7aa..70da37fa84 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -32,7 +32,7 @@ def merge(other)
       elsif other
         spawn.merge!(other)
       else
-        self
+        raise ArgumentError, "invalid argument: #{other.inspect}."
       end
     end
 
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 194faa9473..c9c05b75a6 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -168,6 +168,22 @@ def test_references_values_dont_duplicate
       assert_raises(ArgumentError) { Relation::HashMerger.new(nil, omg: 'lol') }
     end
 
+    test 'merging nil or false raises' do
+      relation = Relation.new(FakeKlass, :b, nil)
+
+      e = assert_raises(ArgumentError) do
+        relation = relation.merge nil
+      end
+
+      assert_equal 'invalid argument: nil.', e.message
+
+      e = assert_raises(ArgumentError) do
+        relation = relation.merge false
+      end
+
+      assert_equal 'invalid argument: false.', e.message
+    end
+
     test '#values returns a dup of the values' do
       relation = Relation.new(FakeKlass, :b, nil).where! :foo
       values   = relation.values
-- 
GitLab