From 7f4e17451135a8aee597e24aac4670a6d8860047 Mon Sep 17 00:00:00 2001 From: Dražen Odobašić Date: Sun, 19 Nov 2017 10:13:10 -0500 Subject: [1.11.x] Fixed #28817 -- Made QuerySet.iterator() use server-side cursors after values() and values_list(). Backport of d97f026a7ab5212192426e45121f7a52751a2044 from master --- tests/backends/test_postgresql.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'tests/backends/test_postgresql.py') diff --git a/tests/backends/test_postgresql.py b/tests/backends/test_postgresql.py index 8ea8638306..2efec5eef2 100644 --- a/tests/backends/test_postgresql.py +++ b/tests/backends/test_postgresql.py @@ -3,7 +3,7 @@ import unittest from collections import namedtuple from contextlib import contextmanager -from django.db import connection +from django.db import connection, models from django.test import TestCase from .models import Person @@ -53,6 +53,19 @@ class ServerSideCursorsPostgres(TestCase): def test_server_side_cursor(self): self.assertUsesCursor(Person.objects.iterator()) + def test_values(self): + self.assertUsesCursor(Person.objects.values('first_name').iterator()) + + def test_values_list(self): + self.assertUsesCursor(Person.objects.values_list('first_name').iterator()) + + def test_values_list_flat(self): + self.assertUsesCursor(Person.objects.values_list('first_name', flat=True).iterator()) + + def test_values_list_fields_not_equal_to_names(self): + expr = models.Count('id') + self.assertUsesCursor(Person.objects.annotate(id__count1=expr).values_list(expr, 'id__count1').iterator()) + def test_server_side_cursor_many_cursors(self): persons = Person.objects.iterator() persons2 = Person.objects.iterator() -- cgit v1.3