Merge pull request #42591 from dinahshi/strict-loading-mode-ivar

Convert strict_loading_mode from class attr to ivar

activerecord/lib/active_record/associations/association.rb

@@ -240,7 +240,7 @@ module ActiveRecord
             if owner.strict_loading_n_plus_one_only? && reflection.macro == :has_many
               record.strict_loading!
             else
-              record.strict_loading_mode = owner.strict_loading_mode
+              record.strict_loading!(false, mode: owner.strict_loading_mode)
             end
           end
         end

activerecord/lib/active_record/core.rb

@@ -68,7 +68,6 @@ module ActiveRecord
       class_attribute :belongs_to_required_by_default, instance_accessor: false
 
       class_attribute :strict_loading_by_default, instance_accessor: false, default: false
-      class_attribute :strict_loading_mode, instance_accessor: true, default: :all
 
       class_attribute :has_many_inversing, instance_accessor: false, default: false
 
@@ -677,6 +676,8 @@ module ActiveRecord
       @strict_loading = value
     end
 
+    attr_reader :strict_loading_mode
+
     # Returns +true+ if the record uses strict_loading with +:n_plus_one_only+ mode enabled.
     def strict_loading_n_plus_one_only?
       @strict_loading_mode == :n_plus_one_only
@@ -768,7 +769,7 @@ module ActiveRecord
 
         @primary_key         = klass.primary_key
         @strict_loading      = klass.strict_loading_by_default
-        @strict_loading_mode = klass.strict_loading_mode
+        @strict_loading_mode = :all
 
         klass.define_attribute_methods
       end

activerecord/test/cases/strict_loading_test.rb

@@ -77,51 +77,6 @@ class StrictLoadingTest < ActiveRecord::TestCase
     end
   end
 
-  def test_strict_loading_n_plus_one_only_mode_by_default
-    with_strict_loading_by_default(Developer) do
-      previous_strict_loading_mode = Developer.strict_loading_mode
-      Developer.strict_loading_mode = :n_plus_one_only
-
-      developer = Developer.first
-      ship = Ship.first
-      ShipPart.create!(name: "Stern", ship: ship)
-      firm = Firm.create!(name: "NASA")
-      project = Project.create!(name: "Apollo", firm: firm)
-
-      ship.update_column(:developer_id, developer.id)
-      developer.projects << project
-      developer.reload
-
-      assert_predicate developer, :strict_loading?
-
-      # Does not raise when loading a has_many association (:projects)
-      assert_nothing_raised do
-        developer.projects.to_a
-      end
-
-      # strict_loading is enabled for has_many associations
-      assert developer.projects.all?(&:strict_loading?)
-      assert_raises ActiveRecord::StrictLoadingViolationError do
-        developer.projects.last.firm
-      end
-
-      # Does not raise when a belongs_to association (:ship) loads its
-      # has_many association (:parts)
-      assert_nothing_raised do
-        developer.ship.parts.to_a
-      end
-
-      # strict_loading is enabled for has_many through a belongs_to
-      assert_not developer.ship.strict_loading?
-      assert developer.ship.parts.all?(&:strict_loading?)
-      assert_raises ActiveRecord::StrictLoadingViolationError do
-        developer.ship.parts.first.trinkets.to_a
-      end
-    ensure
-      Developer.strict_loading_mode = previous_strict_loading_mode
-    end
-  end
-
   def test_strict_loading
     Developer.all.each { |d| assert_not d.strict_loading? }
     Developer.strict_loading.each { |d| assert d.strict_loading? }