Remove deprecated private API in ActiveRecord::Associations::Preloader

rails · Nov 17, 2021 · e3b9779 · e3b9779
1 parent 0792661
commit e3b9779
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 36 deletions.
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
@@ -93,25 +93,21 @@ class Preloader # :nodoc:
       # associations before querying the database. This can save database
       # queries by reusing in-memory objects. The optimization is only applied
       # to single associations (i.e. :belongs_to, :has_one) with no scopes.
-      def initialize(associate_by_default: true, **kwargs)
-        if kwargs.empty?
-          ActiveSupport::Deprecation.warn("Calling `Preloader#initialize` without arguments is deprecated and will be removed in Rails 7.0.")
-        else
-          @records = kwargs[:records]
-          @associations = kwargs[:associations]
-          @scope = kwargs[:scope]
-          @available_records = kwargs[:available_records] || []
-          @associate_by_default = associate_by_default
+      def initialize(records:, associations:, scope: nil, available_records: [], associate_by_default: true)
+        @records = records
+        @associations = associations
+        @scope = scope
+        @available_records = available_records || []
+        @associate_by_default = associate_by_default
 
-          @tree = Branch.new(
-            parent: nil,
-            association: nil,
-            children: associations,
-            associate_by_default: @associate_by_default,
-            scope: @scope
-          )
-          @tree.preloaded_records = records
-        end
+        @tree = Branch.new(
+          parent: nil,
+          association: nil,
+          children: @associations,
+          associate_by_default: @associate_by_default,
+          scope: @scope
+        )
+        @tree.preloaded_records = @records
       end
 
       def empty?
@@ -124,12 +120,6 @@ def call
         loaders
       end
 
-      def preload(records, associations, preload_scope = nil)
-        ActiveSupport::Deprecation.warn("`preload` is deprecated and will be removed in Rails 7.0. Call `Preloader.new(kwargs).call` instead.")
-
-        Preloader.new(records: records, associations: associations, scope: preload_scope).call
-      end
-
       def branches
         @tree.children
       end

diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
@@ -397,18 +397,6 @@ def test_preload_with_scope
     assert_equal [comments(:greetings)], post.comments
   end
 
-  def test_legacy_preload_with_scope
-    post = posts(:welcome)
-
-    assert_deprecated do
-      preloader = ActiveRecord::Associations::Preloader.new
-      preloader.preload([post], :comments, Comment.where(body: "Thank you for the welcome"))
-    end
-
-    assert_predicate post.comments, :loaded?
-    assert_equal [comments(:greetings)], post.comments
-  end
-
   def test_preload_makes_correct_number_of_queries_on_array
     post = posts(:welcome)