Merge pull request #45018 from lucthev/lt/strict-false

Fix disabling strict_loading when enabled by default
rails · May 4, 2022 · f99f422 · f99f422
1 parent fd7dc8f
commit f99f422
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
@@ -917,7 +917,7 @@ def exec_queries(&block)
           preload_associations(records) unless skip_preloading_value
 
           records.each(&:readonly!) if readonly_value
-          records.each(&:strict_loading!) if strict_loading_value
+          records.each { |record| record.strict_loading!(strict_loading_value) } unless strict_loading_value.nil?
 
           records
         end

diff --git a/activerecord/test/cases/strict_loading_test.rb b/activerecord/test/cases/strict_loading_test.rb
@@ -86,6 +86,7 @@ def test_strict_loading
   def test_strict_loading_by_default
     with_strict_loading_by_default(Developer) do
       Developer.all.each { |d| assert d.strict_loading? }
+      Developer.strict_loading(false).each { |d| assert_not d.strict_loading? }
     end
   end