p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2008-07-22 07:37:09 +00:00
parent 0e9587fd6b
commit 83e97ecf88
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/sql/query.py
View File

@ -1616,8 +1616,9 @@ class Query(object):
if self.ordering_aliases: if self.ordering_aliases:
result = order_modified_iter(cursor, len(self.ordering_aliases), result = order_modified_iter(cursor, len(self.ordering_aliases),
self.connection.features.empty_fetchmany_value) self.connection.features.empty_fetchmany_value)
result = iter((lambda: cursor.fetchmany(GET_ITERATOR_CHUNK_SIZE)), else:
self.connection.features.empty_fetchmany_value) 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 not self.connection.features.can_use_chunked_reads:
# If we are using non-chunked reads, we return the same data # If we are using non-chunked reads, we return the same data
# structure as normally, but ensure it is all read into memory # structure as normally, but ensure it is all read into memory

5
tests/regressiontests/queries/models.py
View File

@ -822,6 +822,11 @@ Bug #7759 -- count should work with a partially read result set.
... break ... break
True 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 # In Python 2.3, exceptions raised in __len__ are swallowed (Python issue