Ticket #7312: 7312.regressiontest.diff

tests/regressiontests/queries/models.py

@@ -134 +134 @@
     def __unicode__(self):
         return self.data
 
+class CustomQ(object):
+    def __init__(self, *args, **kwargs):
+        self.args = args
+        self.kwargs = kwargs
+    def add_to_query(self, query, aliases):
+        query.add_q(Q(*self.args, **self.kwargs))
 
 __test__ = {'API_TESTS':"""
 >>> t1 = Tag(name='t1')
@@ -701 +707 @@
 >>> mm = ManagedModel.objects.create(data='mm1', tag=t1, is_public=True)
 >>> ManagedModel.objects.update(data='mm')
 
+Bug #7312
+>>> Item.objects.complex_filter(CustomQ(tags=t1)).order_by('name')
+[<Item: one>, <Item: two>]
+>>> Item.objects.complex_filter(CustomQ(tags=t1)).filter(Q(tags=t2))
+[<Item: one>]
+
 """}