From 6a28f581c0fec79f387fa10dddb9bdc8594a03d6 Mon Sep 17 00:00:00 2001
From: Justin Bronn <jbronn@gmail.com>
Date: Tue, 23 Feb 2010 05:59:04 +0000
Subject: 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
---
 tests/regressiontests/extra_regress/models.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests/regressiontests')

diff --git a/tests/regressiontests/extra_regress/models.py b/tests/regressiontests/extra_regress/models.py
index 76eb549f81..65c53e65b3 100644
--- a/tests/regressiontests/extra_regress/models.py
+++ b/tests/regressiontests/extra_regress/models.py
@@ -208,4 +208,8 @@ True
 >>> TestObject.objects.filter(pk__in=TestObject.objects.values('pk').extra(select={'extra': 1}))
 [<TestObject: TestObject: first,second,third>]
 
+>>> pk = TestObject.objects.get().pk
+>>> TestObject.objects.filter(pk=pk) | TestObject.objects.extra(where=["id > %s"], params=[pk])
+[<TestObject: TestObject: first,second,third>]
+
 """}
-- 
cgit v1.3