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, 2 insertions, 15 deletions

diff --git a/activerecord/test/cases/relation/where_clause_test.rb b/activerecord/test/cases/relation/where_clause_test.rb
index c3296b28fd..c20ed94d90 100644
--- a/activerecord/test/cases/relation/where_clause_test.rb
+++ b/activerecord/test/cases/relation/where_clause_test.rb
@@ -62,21 +62,8 @@ class ActiveRecord::Relation
     end
 
     test "merge allows for columns with the same name from different tables" do
-      table2 = Arel::Table.new("table2")
-      a = WhereClause.new(
-        [table["id"].eq(bind_param), table2["id"].eq(bind_param), table["name"].eq(bind_param)],
-        [attribute("id", 3), attribute("id", 2), attribute("name", "Jim")]
-      )
-      b = WhereClause.new(
-        [table["id"].eq(bind_param), table["name"].eq(bind_param)],
-        [attribute("id", 1), attribute("name", "Sean")],
-      )
-      expected = WhereClause.new(
-        [table2["id"].eq(bind_param), table["id"].eq(bind_param), table["name"].eq(bind_param)],
-        [attribute("id", 2), attribute("id", 1), attribute("name", "Sean")],
-      )
-
-      assert_equal expected, a.merge(b)
+      skip "This is not possible as of 4.2, and the binds do not yet contain sufficient information for this to happen"
+      # We might be able to change the implementation to remove conflicts by index, rather than column name
     end
 
     test "a clause knows if it is empty" do