Fixed #12855 -- QuerySets? with extra where parameters now combine correctly. Thanks, Alex Gaynor.

Backport of r12502 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12507 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 9 insertions, 1 deletions

diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py
index ec0545ca5b..9ae5e74c42 100644
--- a/django/db/models/sql/where.py
+++ b/django/db/models/sql/where.py
@@ -216,7 +216,7 @@ class WhereNode(tree.Node):
                 child.relabel_aliases(change_map)
             elif isinstance(child, tree.Node):
                 self.relabel_aliases(change_map, child)
-            else:
+            elif isinstance(child, (list, tuple)):
                 if isinstance(child[0], (list, tuple)):
                     elt = list(child[0])
                     if elt[0] in change_map:
@@ -249,6 +249,14 @@ class NothingNode(object):
     def relabel_aliases(self, change_map, node=None):
         return
 
+class ExtraWhere(object):
+    def __init__(self, sqls, params):
+        self.sqls = sqls
+        self.params = params
+    
+    def as_sql(self, qn=None):
+        return " AND ".join(self.sqls), tuple(self.params or ())
+
 class Constraint(object):
     """
     An object that can be passed to WhereNode.add() and knows how to