Changeset 6867

Timestamp:

12/03/07 15:10:51 (9 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Fixed query disjunctions.

Files:

• django/branches/queryset-refactor/django/db/models/sql/query.py (modified) (4 diffs)
• django/branches/queryset-refactor/tests/regressiontests/queries/models.py (modified) (1 diff)

django/branches/queryset-refactor/django/db/models/sql/query.py

@@ -9 +9 @@
-
-import copy
+import operator
-import re
-
@@ -466 +467 @@
-        for field in ordering:
-            if field == '?':
-or
+ion
-                continue
-            if isinstance(field, int):
@@ -725 +726 @@
-            self.promote_alias(join_list[-1][0])
-
+        if connector == OR:
+            # Some joins may need to be promoted when adding a new filter to a
+            # disjunction. We walk the list of new joins and where it diverges
+            # from any previous joins (ref count is 1 in the table list), we
+            # make the new additions (and any existing ones not used in the new
+            # join list) an outer join.
+            join_it = nested_iter(join_list)
+            table_it = iter(self.tables)
+            join_it.next(), table_it.next()
+            for join in join_it:
+                table = table_it.next()
+                if join == table and self.alias_map[join][ALIAS_REFCOUNT] > 1:
+                    continue
+                self.promote_alias(join)
+                if table != join:
+                    self.promote_alias(table)
+                break
+            for join in join_it:
+                self.promote_alias(join)
+            for table in table_it:
+                # Some of these will have been promoted from the join_list, but
+                # that's harmless.
+                self.promote_alias(table)
+
-        self.where.add([alias, col, field, lookup_type, value], connector)
+
-        if negate:
-            flag = False
@@ -1199 +1225 @@
-        yield rows
-
+def nested_iter(nested):
+    """
+    An iterator over a sequence of sequences. Each element is returned in turn.
+    Only handles one level of nesting, since that's all we need here.
+    """
+    for seq in nested:
+        for elt in seq:
+            yield elt
+
-def setup_join_cache(sender):
-    """

django/branches/queryset-refactor/tests/regressiontests/queries/models.py

@@ -197 +197 @@
->>> Author.objects.filter(Q(name='a3') | Q(item__name='one'))
-[<Author: a1>, <Author: a3>]
+>>> Author.objects.filter(Q(item__name='three') | Q(report__name='r3'))
+[<Author: a2>]
-
-Bug #6074