Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #7791 -- Fixed a really silly error I introduced in [7926]. :-(

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 83e97ecf885676f29170ee036ca210d28dfe19fb 1 parent 0e9587f
@malcolmt malcolmt authored
View
5 django/db/models/sql/query.py
@@ -1616,8 +1616,9 @@ def execute_sql(self, result_type=MULTI):
if self.ordering_aliases:
result = order_modified_iter(cursor, len(self.ordering_aliases),
self.connection.features.empty_fetchmany_value)
- result = iter((lambda: cursor.fetchmany(GET_ITERATOR_CHUNK_SIZE)),
- self.connection.features.empty_fetchmany_value)
+ else:
+ result = iter((lambda: cursor.fetchmany(GET_ITERATOR_CHUNK_SIZE)),
+ self.connection.features.empty_fetchmany_value)
if not self.connection.features.can_use_chunked_reads:
# If we are using non-chunked reads, we return the same data
# structure as normally, but ensure it is all read into memory
View
5 tests/regressiontests/queries/models.py
@@ -822,6 +822,11 @@ class Related(models.Model):
... break
True
+Bug #7791 -- there were "issues" when ordering and distinct-ing on fields
+related via ForeignKeys.
+>>> Note.objects.order_by('extrainfo__info').distinct()
+[<Note: n3>, <Note: n1>, <Note: n2>]
+
"""}
# In Python 2.3, exceptions raised in __len__ are swallowed (Python issue
Please sign in to comment.
Something went wrong with that request. Please try again.