From bb6b9aa47279e78d2a17a571da1a1523e3b70c5c Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Wed, 10 Feb 2010 19:21:52 +0000 Subject: Fixed #11535: Corrected SQL generated for queries involving generic relations and ORed Q objects. Thanks to brianglass for report, tobias for fix and test, and Alex for review. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12405 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/query.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 88b3571931..dde1494662 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1100,13 +1100,13 @@ class Query(object): for child in q_object.children: if connector == OR: refcounts_before = self.alias_refcount.copy() + self.where.start_subtree(connector) if isinstance(child, Node): - self.where.start_subtree(connector) self.add_q(child, used_aliases) - self.where.end_subtree() else: self.add_filter(child, connector, q_object.negated, can_reuse=used_aliases) + self.where.end_subtree() if connector == OR: # Aliases that were newly added or not used at all need to # be promoted to outer joins if they are nullable relations. -- cgit v1.3