summaryrefslogtreecommitdiff
path: root/django/db/models/query.py
diff options
context:
space:
mode:
authorDražen Odobašić <dodobas@quaternion.co>2017-11-19 10:13:10 -0500
committerTim Graham <timograham@gmail.com>2017-11-21 10:45:02 -0500
commit7f4e17451135a8aee597e24aac4670a6d8860047 (patch)
tree448522e58d6091715beb41c1ecf42f3a415e0080 /django/db/models/query.py
parent90c120c2b73534bd84166f5e67a01cddfeb4cede (diff)
[1.11.x] Fixed #28817 -- Made QuerySet.iterator() use server-side cursors after values() and values_list().
Backport of d97f026a7ab5212192426e45121f7a52751a2044 from master
Diffstat (limited to 'django/db/models/query.py')
-rw-r--r--django/db/models/query.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 8a97e45b88..379edf3882 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -103,7 +103,7 @@ class ValuesIterable(BaseIterable):
# extra(select=...) cols are always at the start of the row.
names = extra_names + field_names + annotation_names
- for row in compiler.results_iter():
+ for row in compiler.results_iter(chunked_fetch=self.chunked_fetch):
yield dict(zip(names, row))
@@ -119,7 +119,7 @@ class ValuesListIterable(BaseIterable):
compiler = query.get_compiler(queryset.db)
if not query.extra_select and not query.annotation_select:
- for row in compiler.results_iter():
+ for row in compiler.results_iter(chunked_fetch=self.chunked_fetch):
yield tuple(row)
else:
field_names = list(query.values_select)
@@ -135,7 +135,7 @@ class ValuesListIterable(BaseIterable):
else:
fields = names
- for row in compiler.results_iter():
+ for row in compiler.results_iter(chunked_fetch=self.chunked_fetch):
data = dict(zip(names, row))
yield tuple(data[f] for f in fields)
@@ -149,7 +149,7 @@ class FlatValuesListIterable(BaseIterable):
def __iter__(self):
queryset = self.queryset
compiler = queryset.query.get_compiler(queryset.db)
- for row in compiler.results_iter():
+ for row in compiler.results_iter(chunked_fetch=self.chunked_fetch):
yield row[0]