1
0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00

Refs #36430, #36416, #34378 -- Simplified batch size calculation in QuerySet.in_bulk().

This commit is contained in:
Jacob Walls
2025-06-03 21:53:10 -04:00
committed by Sarah Boyce
parent a2ce4900a6
commit d3cf24e9b4
3 changed files with 24 additions and 29 deletions

View File

@@ -147,20 +147,24 @@ class CompositePKTests(TestCase):
result = Comment.objects.in_bulk([self.comment.pk])
self.assertEqual(result, {self.comment.pk: self.comment})
@unittest.mock.patch.object(
type(connection.features), "max_query_params", new_callable=lambda: 10
)
def test_in_bulk_batching(self, mocked_max_query_params):
def test_in_bulk_batching(self):
Comment.objects.all().delete()
num_requiring_batching = (connection.features.max_query_params // 2) + 1
comments = [
Comment(id=i, tenant=self.tenant, user=self.user)
for i in range(1, num_requiring_batching + 1)
]
Comment.objects.bulk_create(comments)
id_list = list(Comment.objects.values_list("pk", flat=True))
with self.assertNumQueries(2):
comment_dict = Comment.objects.in_bulk(id_list=id_list)
batching_required = connection.features.max_query_params is not None
expected_queries = 2 if batching_required else 1
with unittest.mock.patch.object(
type(connection.features), "max_query_params", 10
):
num_requiring_batching = (
connection.ops.bulk_batch_size([Comment._meta.pk], []) + 1
)
comments = [
Comment(id=i, tenant=self.tenant, user=self.user)
for i in range(1, num_requiring_batching + 1)
]
Comment.objects.bulk_create(comments)
id_list = list(Comment.objects.values_list("pk", flat=True))
with self.assertNumQueries(expected_queries):
comment_dict = Comment.objects.in_bulk(id_list=id_list)
self.assertQuerySetEqual(comment_dict, id_list)
def test_iterator(self):