mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #24525 -- Fixed AssertionError in some complex queries.

Browse Source 
Thanks Anssi Kääriäinen for providing the solution.
This commit is contained in:
Tim Graham
2015-08-20 12:46:14 -04:00
parent e7b7f94678
commit 2dc9ec5616
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,7 +556,8 @@ class Query(object):
# distinct joins for the same connection in rhs query, then the
# combined query must have two joins, too.
reuse.discard(new_alias)
change_map[alias] = new_alias
if alias != new_alias:
change_map[alias] = new_alias
if not rhs.alias_refcount[alias]:
# The alias was unused in the rhs query. Unref it so that it
# will be unused in the new query, too. We have to add and