mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-02 00:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #19087 -- Ensured query's base table is never LOUTER joined

Browse source 
This fixes a regression created by join promotion logic refactoring:
01b9c3d519

Thanks to Ivan Virabyan for the report.
This commit is contained in:
Anssi Kääriäinen 2012-10-08 18:36:51 +03:00
parent 4797ad80da
commit a62d53c032
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
django/db/models/sql/query.py
View file

@ -702,6 +702,11 @@ class Query(object):
aliases = list(aliases)
while aliases:
alias = aliases.pop(0)
if self.alias_map[alias].rhs_join_col is None:
# This is the base table (first FROM entry) - this table
# isn't really joined at all in the query, so we should not
# alter its join type.
continue
parent_alias = self.alias_map[alias].lhs_alias
parent_louter = (parent_alias
and self.alias_map[parent_alias].join_type == self.LOUTER)
@ -1188,6 +1193,9 @@ class Query(object):
for alias in join_list:
if self.alias_map[alias].join_type == self.LOUTER:
j_col = self.alias_map[alias].rhs_join_col
# The join promotion logic should never produce
# a LOUTER join for the base join - assert that.
assert j_col is not None
entry = self.where_class()
entry.add(
(Constraint(alias, j_col, None), 'isnull', True),