diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index a65ef1898a8197a29ea0291d15aeac04e0b97e40..c114ea0c0d0b0e30aadb286801307bc6af17544c 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -131,6 +131,8 @@ def merge_single_values end def filter_binds(lhs_binds, removed_wheres) + return lhs_binds if removed_wheres.empty? + set = Set.new removed_wheres.map { |x| x.left.name } lhs_binds.dup.delete_if { |col,_| set.include? col.name } end diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 3c1fae78ce45d9c6262f57a3e7633b9abfdb8d2e..b64ff13d293810c418a52ac717d66b85d5607902 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -1556,4 +1556,16 @@ def test_merging_removes_rhs_bind_parameters merged = left.merge(right) assert_equal [], merged.bind_values end + + def test_merging_keeps_lhs_bind_parameters + column = Post.columns_hash['id'] + binds = [[column, 20]] + + right = Post.where(id: Arel::Nodes::BindParam.new('?')) + right.bind_values += binds + left = Post.where(id: 10) + + merged = left.merge(right) + assert_equal binds, merged.bind_values + end end