1 files changed, 10 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/relation/where_clause.rb b/activerecord/lib/active_record/relation/where_clause.rb
index 2c2d6cfa47..e39dbac0d5 100644
--- a/activerecord/lib/active_record/relation/where_clause.rb
+++ b/activerecord/lib/active_record/relation/where_clause.rb
@@ -18,9 +18,10 @@ module ActiveRecord
       end
 
       def merge(other)
+        conflict_indices = indices_of_predicates_referenced_by(other).to_set
         WhereClause.new(
-          predicates_unreferenced_by(other) + other.predicates,
-          non_conflicting_binds(other) + other.binds,
+          non_conflicting(predicates, conflict_indices) + other.predicates,
+          non_conflicting(binds, conflict_indices) + other.binds,
         )
       end
 
@@ -97,20 +98,18 @@ module ActiveRecord
 
       private
 
-      def predicates_unreferenced_by(other)
-        predicates.reject do |n|
+      def indices_of_predicates_referenced_by(other)
+        predicates.each_with_index.select do |(n, _)|
           equality_node?(n) && other.referenced_columns.include?(n.left)
-        end
+        end.map(&:last)
       end
 
-      def equality_node?(node)
-        node.respond_to?(:operator) && node.operator == :==
+      def non_conflicting(values, conflict_indices)
+        values.reject.with_index { |_, i| conflict_indices.include?(i) }
       end
 
-      def non_conflicting_binds(other)
-        conflicts = referenced_columns & other.referenced_columns
-        conflicts.map! { |node| node.name.to_s }
-        binds.reject { |attr| conflicts.include?(attr.name) }
+      def equality_node?(node)
+        node.respond_to?(:operator) && node.operator == :==
       end
 
       def inverted_predicates