Changeset 8832

Timestamp:

09/01/08 21:16:41 (3 months ago)

Author:

mtredinnick

Message:

Fixed #8439 -- Complex combinations of Q-objects (using both conjunctions and
disjunctions) were producing incorrect SQL when nullable relations were
involved. This fixes that.

Files:

• django/trunk/django/db/models/sql/constants.py (modified) (1 diff)
• django/trunk/django/db/models/sql/query.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/queries/models.py (modified) (4 diffs)

django/trunk/django/db/models/sql/constants.py

@@ -16 +16 @@
-
-# Constants to make looking up tuple values clearer.
-
+
+
-TABLE_NAME = 0
-RHS_ALIAS = 1

django/trunk/django/db/models/sql/query.py

@@ -717 +717 @@
-            self.table_map[alias] = [alias]
-        self.alias_refcount[alias] = 1
-        #self.alias_map[alias] = None
-        self.tables.append(alias)
-        return alias, True
@@ -1189 +1188 @@
-            connector = AND
-            for child in q_object.children:
+                if connector == OR:
+                    refcounts_before = self.alias_refcount.copy()
-                if isinstance(child, Node):
-                    self.where.start_subtree(connector)
@@ -1196 +1197 @@
-                    self.add_filter(child, connector, q_object.negated,
-                            can_reuse=used_aliases)
+                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.
+                    # (they shouldn't turn the whole conditional into the empty
+                    # set just because they don't match anything).
+                    # FIXME: There's some (a lot of!) overlap with the similar
+                    # OR promotion in add_filter(). It's not quite identical,
+                    # but is very similar. So pulling out the common bits is
+                    # something for later (code smell: too much indentation
+                    # here)
+                    considered = {}
+                    for alias in self.tables:
+                        if alias not in used_aliases:
+                            continue
+                        if (alias not in refcounts_before or
+                                self.alias_refcount[alias] ==
+                                refcounts_before[alias]):
+                            parent = self.alias_map[alias][LHS_ALIAS]
+                            must_promote = considered.get(parent, False)
+                            promoted = self.promote_alias(alias, must_promote)
+                            considered[alias] = must_promote or promoted
-                connector = q_object.connector
-            if q_object.negated:

django/trunk/tests/regressiontests/queries/models.py

@@ -224 +224 @@
-    name = models.CharField(max_length=20)
-    order = models.IntegerField()
-
+
-    def __unicode__(self):
-        return self.name
-
+
-__test__ = {'API_TESTS':"""
->>> t1 = Tag.objects.create(name='t1')
@@ -238 +238 @@
->>> n2 = Note.objects.create(note='n2', misc='bar')
->>> n3 = Note.objects.create(note='n3', misc='foo')
+
+>>> ann1 = Annotation.objects.create(name='a1', tag=t1)
+>>> ann1.notes.add(n1)
+>>> ann2 = Annotation.objects.create(name='a2', tag=t4)
+>>> ann2.notes.add(n2, n3)
-
-Create these out of order so that sorting by 'id' will be different to sorting
@@ -843 +848 @@
-
-Bug #7277
->>> ann1 = Annotation.objects.create(name='a1', tag=t1)
->>> ann1.notes.add(n1)
->>> n1.annotation_set.filter(Q(tag=t5) | Q(tag__children=t5) | Q(tag__children__children=t5))
-[<Annotation: a1>]
@@ -932 +935 @@
->>> ReservedName.objects.all().order_by('order')
-[<ReservedName: b>, <ReservedName: a>]
-
->>> ReservedName.objects.extra(select={'stuff':'name'}, order_by=('order','stuff'))
-[<ReservedName: b>, <ReservedName: a>]
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-"""}
-