Remove deprecated support to pass rewhere to ActiveRecord::Relation#merge

Author: rafaelfranca

activerecord/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Remove deprecated support to pass `rewhere` to `ActiveRecord::Relation#merge`.
+
+    *Rafael Mendonça França*
+
 *   Remove deprecated support to pass `deferrable: true` to `add_foreign_key`.
 
     *Rafael Mendonça França*

activerecord/lib/active_record/relation/merger.rb

@@ -7,16 +7,15 @@ class Relation
     class HashMerger # :nodoc:
       attr_reader :relation, :hash
 
-      def initialize(relation, hash, rewhere = nil)
+      def initialize(relation, hash)
         hash.assert_valid_keys(*Relation::VALUE_METHODS)
 
         @relation = relation
         @hash     = hash
-        @rewhere  = rewhere
       end
 
       def merge
-        Merger.new(relation, other, @rewhere).merge
+        Merger.new(relation, other).merge
       end
 
       # Applying values to a relation has some side effects. E.g.
@@ -44,11 +43,10 @@ def other
     class Merger # :nodoc:
       attr_reader :relation, :values, :other
 
-      def initialize(relation, other, rewhere = nil)
+      def initialize(relation, other)
         @relation = relation
         @values   = other.values
         @other    = other
-        @rewhere  = rewhere
       end
 
       NORMAL_VALUES = Relation::VALUE_METHODS - Relation::CLAUSE_METHODS -
@@ -178,7 +176,7 @@ def merge_single_values
         def merge_clauses
           relation.from_clause = other.from_clause if replace_from_clause?
 
-          where_clause = relation.where_clause.merge(other.where_clause, @rewhere)
+          where_clause = relation.where_clause.merge(other.where_clause)
           relation.where_clause = where_clause unless where_clause.empty?
 
           having_clause = relation.having_clause.merge(other.having_clause)

activerecord/lib/active_record/relation/spawn_methods.rb

@@ -41,26 +41,10 @@ def merge(other, *rest)
     end
 
     def merge!(other, *rest) # :nodoc:
-      options = rest.extract_options!
-
-      if options.key?(:rewhere)
-        if options[:rewhere]
-          ActiveRecord.deprecator.warn(<<-MSG.squish)
-            Specifying `Relation#merge(rewhere: true)` is deprecated, as that has now been
-            the default since Rails 7.0. Setting the rewhere option will error in Rails 7.2
-          MSG
-        else
-          ActiveRecord.deprecator.warn(<<-MSG.squish)
-            `Relation#merge(rewhere: false)` is deprecated without replacement,
-            and will be removed in Rails 7.2
-          MSG
-        end
-      end
-
       if other.is_a?(Hash)
-        Relation::HashMerger.new(self, other, options[:rewhere]).merge
+        Relation::HashMerger.new(self, other).merge
       elsif other.is_a?(Relation)
-        Relation::Merger.new(self, other, options[:rewhere]).merge
+        Relation::Merger.new(self, other).merge
       elsif other.respond_to?(:to_proc)
         instance_exec(&other)
       else

activerecord/lib/active_record/relation/where_clause.rb

@@ -23,12 +23,8 @@ def |(other)
         WhereClause.new(predicates | other.predicates)
       end
 
-      def merge(other, rewhere = nil)
-        predicates = if rewhere
-          except_predicates(other.extract_attributes)
-        else
-          predicates_unreferenced_by(other)
-        end
+      def merge(other)
+        predicates = except_predicates(other.extract_attributes)
 
         WhereClause.new(predicates | other.predicates)
       end
@@ -156,18 +152,6 @@ def equalities(predicates, equality_only)
           equalities
         end
 
-        def predicates_unreferenced_by(other)
-          referenced_columns = other.referenced_columns
-
-          predicates.reject do |node|
-            attr = extract_attribute(node) || begin
-              node.left if equality_node?(node) && node.left.is_a?(Arel::Predications)
-            end
-
-            attr && referenced_columns[attr]
-          end
-        end
-
         def equality_node?(node)
           !node.is_a?(String) && node.equality?
         end

activerecord/test/cases/relation/merging_test.rb

@@ -24,41 +24,23 @@ def test_merge_in_clause
 
     assert_equal [mary], david_and_mary.merge(Author.where(id: mary))
     assert_equal [mary], david_and_mary.merge(Author.rewhere(id: mary))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [mary], david_and_mary.merge(Author.where(id: mary), rewhere: true)
-    end
 
     assert_equal [bob],  david_and_mary.merge(Author.where(id: bob))
     assert_equal [bob],  david_and_mary.merge(Author.rewhere(id: bob))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [bob],  david_and_mary.merge(Author.where(id: bob), rewhere: true)
-    end
 
     assert_equal [david, bob], mary_and_bob.merge(Author.where(id: [david, bob]))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, bob], mary_and_bob.merge(Author.where(id: [david, bob]), rewhere: true)
-    end
 
     assert_equal [mary, bob], david_and_mary.merge(mary_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [mary, bob], david_and_mary.merge(mary_and_bob, rewhere: true)
-    end
     assert_equal [mary], david_and_mary.and(mary_and_bob)
     assert_equal authors, david_and_mary.or(mary_and_bob)
 
     assert_equal [david, mary], mary_and_bob.merge(david_and_mary)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, mary], mary_and_bob.merge(david_and_mary, rewhere: true)
-    end
     assert_equal [mary], david_and_mary.and(mary_and_bob)
     assert_equal authors, david_and_mary.or(mary_and_bob)
 
     david_and_bob = Author.where(id: david).or(Author.where(name: "Bob"))
 
     assert_equal [david], david_and_mary.merge(david_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david], david_and_mary.merge(david_and_bob, rewhere: true)
-    end
     assert_equal [david], david_and_mary.and(david_and_bob)
     assert_equal authors, david_and_mary.or(david_and_bob)
   end
@@ -74,41 +56,23 @@ def test_merge_between_clause
 
     assert_equal [mary], david_and_mary.merge(Author.where(id: mary))
     assert_equal [mary], david_and_mary.merge(Author.rewhere(id: mary))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [mary], david_and_mary.merge(Author.where(id: mary), rewhere: true)
-    end
 
     assert_equal [bob], david_and_mary.merge(Author.where(id: bob))
     assert_equal [bob],  david_and_mary.merge(Author.rewhere(id: bob))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [bob],  david_and_mary.merge(Author.where(id: bob), rewhere: true)
-    end
 
     assert_equal [david, bob], mary_and_bob.merge(Author.where(id: [david, bob]))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, bob], mary_and_bob.merge(Author.where(id: [david, bob]), rewhere: true)
-    end
 
     assert_equal [mary, bob], david_and_mary.merge(mary_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [mary, bob], david_and_mary.merge(mary_and_bob, rewhere: true)
-    end
     assert_equal [mary], david_and_mary.and(mary_and_bob)
     assert_equal authors, david_and_mary.or(mary_and_bob)
 
     assert_equal [david, mary], mary_and_bob.merge(david_and_mary)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, mary], mary_and_bob.merge(david_and_mary, rewhere: true)
-    end
     assert_equal [mary], david_and_mary.and(mary_and_bob)
     assert_equal authors, david_and_mary.or(mary_and_bob)
 
     david_and_bob = Author.where(id: david).or(Author.where(name: "Bob"))
 
     assert_equal [david], david_and_mary.merge(david_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david], david_and_mary.merge(david_and_bob, rewhere: true)
-    end
     assert_equal [david], david_and_mary.and(david_and_bob)
     assert_equal authors, david_and_mary.or(david_and_bob)
   end
@@ -124,42 +88,24 @@ def test_merge_or_clause
 
     assert_equal [mary], david_and_mary.merge(Author.where(id: mary))
     assert_equal [mary], david_and_mary.merge(Author.rewhere(id: mary))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [mary], david_and_mary.merge(Author.where(id: mary), rewhere: true)
-    end
 
     assert_equal [bob], david_and_mary.merge(Author.where(id: bob))
     assert_equal [bob],  david_and_mary.merge(Author.rewhere(id: bob))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [bob],  david_and_mary.merge(Author.where(id: bob), rewhere: true)
-    end
 
     assert_equal [david, bob], mary_and_bob.merge(Author.where(id: [david, bob]))
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, bob], mary_and_bob.merge(Author.where(id: [david, bob]), rewhere: true)
-    end
 
 
     assert_equal [mary, bob], david_and_mary.merge(mary_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [mary, bob], david_and_mary.merge(mary_and_bob, rewhere: true)
-    end
     assert_equal [mary], david_and_mary.and(mary_and_bob)
     assert_equal authors, david_and_mary.or(mary_and_bob)
 
     assert_equal [david, mary], mary_and_bob.merge(david_and_mary)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, mary], mary_and_bob.merge(david_and_mary, rewhere: true)
-    end
     assert_equal [mary], david_and_mary.and(mary_and_bob)
     assert_equal authors, david_and_mary.or(mary_and_bob)
 
     david_and_bob = Author.where(id: david).or(Author.where(name: "Bob"))
 
     assert_equal [david], david_and_mary.merge(david_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david], david_and_mary.merge(david_and_bob, rewhere: true)
-    end
     assert_equal [david], david_and_mary.and(david_and_bob)
     assert_equal authors, david_and_mary.or(david_and_bob)
   end
@@ -172,14 +118,8 @@ def test_merge_not_in_clause
     assert_equal [david], non_mary_and_bob
 
     assert_equal [david], Author.where(id: david).merge(non_mary_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david], Author.where(id: david).merge(non_mary_and_bob, rewhere: true)
-    end
 
     assert_equal [david], Author.where(id: mary).merge(non_mary_and_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david], Author.where(id: mary).merge(non_mary_and_bob, rewhere: true)
-    end
   end
 
   def test_merge_not_range_clause
@@ -190,14 +130,8 @@ def test_merge_not_range_clause
     assert_equal [david, mary], less_than_bob
 
     assert_equal [david, mary], Author.where(id: david).merge(less_than_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, mary], Author.where(id: david).merge(less_than_bob, rewhere: true)
-    end
 
     assert_equal [david, mary], Author.where(id: mary).merge(less_than_bob)
-    assert_deprecated(ActiveRecord.deprecator) do
-      assert_equal [david, mary], Author.where(id: mary).merge(less_than_bob, rewhere: true)
-    end
   end
 
   def test_merge_doesnt_duplicate_same_clauses
@@ -226,12 +160,6 @@ def test_merge_doesnt_duplicate_same_clauses
       assert_queries_match(/WHERE \(#{Regexp.escape(author_id)} IN \(1\)\)\z/) do
         assert_equal [david], only_david.merge(only_david)
       end
-
-      assert_queries_match(/WHERE \(#{Regexp.escape(author_id)} IN \(1\)\)\z/) do
-        assert_deprecated(ActiveRecord.deprecator) do
-          assert_equal [david], only_david.merge(only_david, rewhere: true)
-        end
-      end
     end
   end
 
@@ -255,11 +183,6 @@ def test_relation_merging_with_arel_equalities_keeps_last_equality
     devs = Developer.where(salary_attr.eq(80000)).merge(Developer.where(salary_attr.eq(9000)))
     assert_equal [developers(:poor_jamis)], devs.to_a
 
-    assert_deprecated(ActiveRecord.deprecator) do
-      devs = Developer.where(salary_attr.eq(80000)).merge(Developer.where(salary_attr.eq(9000)), rewhere: true)
-    end
-    assert_equal [developers(:poor_jamis)], devs.to_a
-
     devs = Developer.where(salary_attr.eq(80000)).rewhere(salary_attr.eq(9000))
     assert_equal [developers(:poor_jamis)], devs.to_a
   end
@@ -271,11 +194,6 @@ def test_relation_merging_with_arel_equalities_keeps_last_equality_with_non_attr
     devs = Developer.where(abs_salary.eq(80000)).merge(Developer.where(abs_salary.eq(9000)))
     assert_equal [developers(:poor_jamis)], devs.to_a
 
-    assert_deprecated(ActiveRecord.deprecator) do
-      devs = Developer.where(abs_salary.eq(80000)).merge(Developer.where(abs_salary.eq(9000)), rewhere: true)
-    end
-    assert_equal [developers(:poor_jamis)], devs.to_a
-
     devs = Developer.where(abs_salary.eq(80000)).rewhere(abs_salary.eq(9000))
     assert_equal [developers(:poor_jamis)], devs.to_a
   end
@@ -399,24 +317,6 @@ def test_merging_duplicated_annotations
       Post.annotate("bar").merge(Post.annotate("foo")).merge(posts).to_a
     end
   end
-
-  def test_rewhere_true_is_deprecated
-    message = <<-MSG.squish
-      Specifying `Relation#merge(rewhere: true)` is deprecated
-    MSG
-    assert_deprecated(message, ActiveRecord.deprecator) do
-      Author.where(id: 1).merge(Author.where(id: 2), rewhere: true)
-    end
-  end
-
-  def test_rewhere_false_is_deprecated
-    message = <<-MSG.squish
-      Relation#merge(rewhere: false)` is deprecated without replacement
-    MSG
-    assert_deprecated(message, ActiveRecord.deprecator) do
-      Author.where(id: 1).merge(Author.where(id: 2), rewhere: false)
-    end
-  end
 end
 
 class MergingDifferentRelationsTest < ActiveRecord::TestCase

guides/source/7_2_release_notes.md

@@ -162,6 +162,8 @@ Please refer to the [Changelog][active-record] for detailed changes.
 
 *   Remove deprecated support to pass `deferrable: true` to `add_foreign_key`.
 
+*   Remove deprecated support to pass `rewhere` to `ActiveRecord::Relation#merge`.
+
 ### Deprecations
 
 *   Deprecate `Rails.application.config.active_record.allow_deprecated_singular_associations_name`