[2.0.x] Fixed #28817 -- Made QuerySet.iterator() use server-side cursors after values() and values_list().

Backport of d97f026a7ab5212192426e45121f7a52751a2044 from master

1 files changed, 14 insertions, 1 deletions

diff --git a/tests/backends/postgresql/test_server_side_cursors.py b/tests/backends/postgresql/test_server_side_cursors.py
index 53d5afce90..ff06318e6c 100644
--- a/tests/backends/postgresql/test_server_side_cursors.py
+++ b/tests/backends/postgresql/test_server_side_cursors.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__count=expr).values_list(expr, 'id__count').iterator())
+
     def test_server_side_cursor_many_cursors(self):
         persons = Person.objects.iterator()
         persons2 = Person.objects.iterator()