Commit 83e97ecf authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
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
parent 0e9587fd

django/db/models/sql/query.py

+3 −2
Original line number Diff line number Diff line
@@ -1616,6 +1616,7 @@ class Query(object): 
        if self.ordering_aliases:

            result = order_modified_iter(cursor, len(self.ordering_aliases),

                    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:

tests/regressiontests/queries/models.py

+5 −0
Original line number Diff line number Diff line
@@ -822,6 +822,11 @@ Bug #7759 -- count should work with a partially read result set. 
...     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