Fixed #17877 -- Ensured that extra WHERE clauses get correctly ANDed when they contain OR operations. Thanks to Marek Brzóska for the report, to eleather for the test case and to Adrien Lemaire for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17880 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 1 deletions

diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py
index 2bd705dd60..0bc3638b80 100644
--- a/django/db/models/sql/where.py
+++ b/django/db/models/sql/where.py
@@ -281,7 +281,8 @@ class ExtraWhere(object):
         self.params = params
 
     def as_sql(self, qn=None, connection=None):
-        return " AND ".join(self.sqls), tuple(self.params or ())
+        sqls = ["(%s)" % sql for sql in self.sqls]
+        return " AND ".join(sqls), tuple(self.params or ())
 
 class Constraint(object):
     """