mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 18:59:13 +00:00
Code Issues 32 Releases Wiki Activity

queryset-refactor: Infinite loop detection in model ordering was being a little

Browse Source 
too aggressive. Fixed that.


git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-03-11 08:23:51 +00:00
parent 3176bebffd
commit f3ed30f377
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,14 +518,14 @@ class Query(object):
# If we get to this point and the field is a relation to another model, # If we get to this point and the field is a relation to another model,
# append the default ordering for that model. # append the default ordering for that model.
if len(joins) > 1 and opts.ordering: if field.rel and len(joins) > 1 and opts.ordering:
# Firstly, avoid infinite loops. # Firstly, avoid infinite loops.
if not already_seen: if not already_seen:
already_seen = {} already_seen = set()
join_tuple = tuple([tuple(j) for j in joins]) join_tuple = tuple([tuple(j) for j in joins])
if join_tuple in already_seen: if join_tuple in already_seen:
raise FieldError('Infinite loop caused by ordering.') raise FieldError('Infinite loop caused by ordering.')
already_seen[join_tuple] = True already_seen.add(join_tuple)
results = [] results = []
for item in opts.ordering: for item in opts.ordering:

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

@ -407,6 +407,11 @@ Traceback (most recent call last):
... ...
FieldError: Infinite loop caused by ordering. FieldError: Infinite loop caused by ordering.
# ... but you can still order in a non-recursive fashion amongst linked fields
# (the previous test failed because the default ordering was recursive).
>>> LoopX.objects.all().order_by('y__x__id')
[]
# If the remote model does not have a default ordering, we order by its 'id' # If the remote model does not have a default ordering, we order by its 'id'
# field. # field.
>>> Item.objects.order_by('creator', 'name') >>> Item.objects.order_by('creator', 'name')