Fixed #35073 -- Avoided unnecessary calling of callables used by SET/SET_DEFAULT in Collector.collect().

1 files changed, 11 insertions, 3 deletions

diff --git a/tests/delete_regress/tests.py b/tests/delete_regress/tests.py
index 89f4d5ddd8..ce5a0db8ab 100644
--- a/tests/delete_regress/tests.py
+++ b/tests/delete_regress/tests.py
@@ -408,9 +408,17 @@ class SetQueryCountTests(TestCase):
         Item.objects.create(
             version=version,
             location=location,
-            location_default=location,
             location_value=location,
         )
-        # 3 UPDATEs for SET of item values and one for DELETE locations.
-        with self.assertNumQueries(4):
+        # 2 UPDATEs for SET of item values and one for DELETE locations.
+        with self.assertNumQueries(3):
             location.delete()
+
+
+class SetCallableCollectorDefaultTests(TestCase):
+    def test_set(self):
+        # Collector doesn't call callables used by models.SET and
+        # models.SET_DEFAULT if not necessary.
+        Toy.objects.create(name="test")
+        Toy.objects.all().delete()
+        self.assertSequenceEqual(Toy.objects.all(), [])