Revert "Change `WhereClause#merge` to same named columns on diff tables"

This reverts commit 5d41cb3bfd6b19833261622ce5d339b1e580bd8b.

This implementation does not properly handle cases involving predicates
which are not associated with a bind param. I have the fix in mind, but
don't have time to implement just yet. It will be more similar to #22823
than not.

1 files changed, 11 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/relation/where_clause.rb b/activerecord/lib/active_record/relation/where_clause.rb
index e39dbac0d5..2c2d6cfa47 100644
--- a/activerecord/lib/active_record/relation/where_clause.rb
+++ b/activerecord/lib/active_record/relation/where_clause.rb
@@ -18,10 +18,9 @@ module ActiveRecord
       end
 
       def merge(other)
-        conflict_indices = indices_of_predicates_referenced_by(other).to_set
         WhereClause.new(
-          non_conflicting(predicates, conflict_indices) + other.predicates,
-          non_conflicting(binds, conflict_indices) + other.binds,
+          predicates_unreferenced_by(other) + other.predicates,
+          non_conflicting_binds(other) + other.binds,
         )
       end
 
@@ -98,20 +97,22 @@ module ActiveRecord
 
       private
 
-      def indices_of_predicates_referenced_by(other)
-        predicates.each_with_index.select do |(n, _)|
+      def predicates_unreferenced_by(other)
+        predicates.reject do |n|
           equality_node?(n) && other.referenced_columns.include?(n.left)
-        end.map(&:last)
-      end
-
-      def non_conflicting(values, conflict_indices)
-        values.reject.with_index { |_, i| conflict_indices.include?(i) }
+        end
       end
 
       def equality_node?(node)
         node.respond_to?(:operator) && node.operator == :==
       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) }
+      end
+
       def inverted_predicates
         predicates.map { |node| invert_predicate(node) }
       end