Changeset 6901

Timestamp:

12/09/07 02:01:26 (7 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Added a test to show that various Q() combinations work when the same field with different lookup types are combined. Refs #4289.

Files:

• django/branches/queryset-refactor/tests/regressiontests/queries/models.py (modified) (4 diffs)

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

@@ -80 +80 @@
-    def __unicode__(self):
-        return self.title
+
+class Number(models.Model):
+    num = models.IntegerField()
+
+    def __unicode__(self):
+        return unicode(self.num)
-
-# Some funky cross-linked models for testing a couple of infinite recursion
@@ -155 +161 @@
->>> c2.save()
-
+>>> n1 = Number(num=4)
+>>> n1.save()
+>>> n2 = Number(num=8)
+>>> n2.save()
+>>> n3 = Number(num=12)
+>>> n3.save()
+
-Bug #1050
->>> Item.objects.filter(tags__isnull=True)
@@ -199 +212 @@
->>> Author.objects.filter(Q(item__name='three') | Q(report__name='r3'))
-[<Author: a2>]
+
+Bug #4289
+A slight variation on the above theme: restricting the choices by the lookup
+constraints.
+>>> Number.objects.filter(num__lt=4)
+[]
+>>> Number.objects.filter(num__gt=8, num__lt=12)
+[]
+>>> Number.objects.filter(num__gt=8, num__lt=13)
+[<Number: 12>]
+>>> Number.objects.filter(Q(num__lt=4) | Q(num__gt=8, num__lt=12))
+[]
+>>> Number.objects.filter(Q(num__gt=8, num__lt=12) | Q(num__lt=4))
+[]
+>>> Number.objects.filter(Q(num__gt=8) & Q(num__lt=12) | Q(num__lt=4))
+[]
+>>> Number.objects.filter(Q(num__gt=7) & Q(num__lt=12) | Q(num__lt=4))
+[<Number: 8>]
-
-Bug #6074
@@ -428 +459 @@
->>> Item.objects.extra(select={'count': 'select count(*) from queries_item_tags where queries_item_tags.item_id = queries_item.id'}).filter(count=1)
-[<Item: four>]
+
-"""}
-