summaryrefslogtreecommitdiff
path: root/django/db/models/sql
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:38:14 -0500
commit286120444f0fc5aa901dfc36a3f864e94beb2ffb (patch)
treeaf613dd76766902f6d0f2f8db6d898ccfc6a6d6b /django/db/models/sql
parentd380afc6a5a9622c70f10083af8a14c9f13343d5 (diff)
[2.0.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/sql')
-rw-r--r--django/db/models/sql/compiler.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 2b08b9d79e..279aa7a00f 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -1007,10 +1007,11 @@ class SQLCompiler:
row[pos] = value
yield row
- def results_iter(self, results=None, tuple_expected=False):
+ def results_iter(self, results=None, tuple_expected=False, chunked_fetch=False,
+ chunk_size=GET_ITERATOR_CHUNK_SIZE):
"""Return an iterator over the results from executing this query."""
if results is None:
- results = self.execute_sql(MULTI)
+ results = self.execute_sql(MULTI, chunked_fetch=chunked_fetch, chunk_size=chunk_size)
fields = [s[0] for s in self.select[0:self.col_count]]
converters = self.get_converters(fields)
rows = chain.from_iterable(results)