fix interpolation for hash merging

1 files changed, 13 insertions, 4 deletions

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index d1fb3e01d2..8a7a2441d4 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -130,9 +130,9 @@ module ActiveRecord
 
     test 'merging a hash into a relation' do
       relation = Relation.new :a, :b
-      relation = relation.merge where: ['lol'], readonly: true
+      relation = relation.merge where: :lol, readonly: true
 
-      assert_equal ['lol'], relation.where_values
+      assert_equal [:lol], relation.where_values
       assert_equal true, relation.readonly_value
     end
 
@@ -162,6 +162,15 @@ module ActiveRecord
       relation.merge!(where: :foo)
       assert_equal [:foo], relation.where_values
     end
+
+    test 'merging a hash interpolates conditions' do
+      klass = stub
+      klass.stubs(:sanitize_sql).with(['foo = ?', 'bar']).returns('foo = bar')
+
+      relation = Relation.new(klass, :b)
+      relation.merge!(where: ['foo = ?', 'bar'])
+      assert_equal ['foo = bar'], relation.where_values
+    end
   end
 
   class RelationMutationTest < ActiveSupport::TestCase
@@ -227,8 +236,8 @@ module ActiveRecord
     end
 
     test 'merge!' do
-      assert relation.merge!(where: ['foo']).equal?(relation)
-      assert_equal ['foo'], relation.where_values
+      assert relation.merge!(where: :foo).equal?(relation)
+      assert_equal [:foo], relation.where_values
     end
   end
 end