diff -r 5ff1fc726848 -r c6bca38c1cbf parts/django/tests/modeltests/or_lookups/tests.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/parts/django/tests/modeltests/or_lookups/tests.py	Sat Jan 08 11:20:57 2011 +0530
@@ -0,0 +1,232 @@
+from datetime import datetime
+from operator import attrgetter
+
+from django.db.models import Q
+from django.test import TestCase
+
+from models import Article
+
+
+class OrLookupsTests(TestCase):
+
+    def setUp(self):
+        self.a1 = Article.objects.create(
+            headline='Hello', pub_date=datetime(2005, 11, 27)
+        ).pk
+        self.a2 = Article.objects.create(
+            headline='Goodbye', pub_date=datetime(2005, 11, 28)
+        ).pk
+        self.a3 = Article.objects.create(
+            headline='Hello and goodbye', pub_date=datetime(2005, 11, 29)
+        ).pk
+
+    def test_filter_or(self):
+        self.assertQuerysetEqual(
+            Article.objects.filter(headline__startswith='Hello') |  Article.objects.filter(headline__startswith='Goodbye'), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(headline__contains='Hello') | Article.objects.filter(headline__contains='bye'), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(headline__iexact='Hello') | Article.objects.filter(headline__contains='ood'), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(headline__startswith='Hello') | Q(headline__startswith='Goodbye')), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+
+    def test_stages(self):
+        # You can shorten this syntax with code like the following,  which is
+        # especially useful if building the query in stages:
+        articles = Article.objects.all()
+        self.assertQuerysetEqual(
+            articles.filter(headline__startswith='Hello') & articles.filter(headline__startswith='Goodbye'),
+            []
+        )
+        self.assertQuerysetEqual(
+            articles.filter(headline__startswith='Hello') & articles.filter(headline__contains='bye'), [
+                'Hello and goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+    def test_pk_q(self):
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(pk=self.a1) | Q(pk=self.a2)), [
+                'Hello',
+                'Goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(pk=self.a1) | Q(pk=self.a2) | Q(pk=self.a3)), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline"),
+        )
+
+    def test_pk_in(self):
+        self.assertQuerysetEqual(
+            Article.objects.filter(pk__in=[self.a1, self.a2, self.a3]), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline"),
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(pk__in=(self.a1, self.a2, self.a3)), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline"),
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(pk__in=[self.a1, self.a2, self.a3, 40000]), [
+                'Hello',
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline"),
+        )
+
+    def test_q_negated(self):
+        # Q objects can be negated
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(pk=self.a1) | ~Q(pk=self.a2)), [
+                'Hello',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(~Q(pk=self.a1) & ~Q(pk=self.a2)), [
+                'Hello and goodbye'
+            ],
+            attrgetter("headline"),
+        )
+        # This allows for more complex queries than filter() and exclude()
+        # alone would allow
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(pk=self.a1) & (~Q(pk=self.a2) | Q(pk=self.a3))), [
+                'Hello'
+            ],
+            attrgetter("headline"),
+        )
+
+    def test_complex_filter(self):
+        # The 'complex_filter' method supports framework features such as
+        # 'limit_choices_to' which normally take a single dictionary of lookup
+        # arguments but need to support arbitrary queries via Q objects too.
+        self.assertQuerysetEqual(
+            Article.objects.complex_filter({'pk': self.a1}), [
+                'Hello'
+            ],
+            attrgetter("headline"),
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.complex_filter(Q(pk=self.a1) | Q(pk=self.a2)), [
+                'Hello',
+                'Goodbye'
+            ],
+            attrgetter("headline"),
+        )
+
+    def test_empty_in(self):
+        # Passing "in" an empty list returns no results ...
+        self.assertQuerysetEqual(
+            Article.objects.filter(pk__in=[]),
+            []
+        )
+        # ... but can return results if we OR it with another query.
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(pk__in=[]) | Q(headline__icontains='goodbye')), [
+                'Goodbye',
+                'Hello and goodbye'
+            ],
+            attrgetter("headline"),
+        )
+
+    def test_q_and(self):
+        # Q arg objects are ANDed
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(headline__startswith='Hello'), Q(headline__contains='bye')), [
+                'Hello and goodbye'
+            ],
+            attrgetter("headline")
+        )
+        # Q arg AND order is irrelevant
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(headline__contains='bye'), headline__startswith='Hello'), [
+                'Hello and goodbye'
+            ],
+            attrgetter("headline"),
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(headline__startswith='Hello') & Q(headline__startswith='Goodbye')),
+            []
+        )
+
+    def test_q_exclude(self):
+        self.assertQuerysetEqual(
+            Article.objects.exclude(Q(headline__startswith='Hello')), [
+                'Goodbye'
+            ],
+            attrgetter("headline")
+        )
+
+    def test_other_arg_queries(self):
+        # Try some arg queries with operations other than filter.
+        self.assertEqual(
+            Article.objects.get(Q(headline__startswith='Hello'), Q(headline__contains='bye')).headline,
+            'Hello and goodbye'
+        )
+
+        self.assertEqual(
+            Article.objects.filter(Q(headline__startswith='Hello') | Q(headline__contains='bye')).count(),
+            3
+        )
+
+        self.assertQuerysetEqual(
+            Article.objects.filter(Q(headline__startswith='Hello'), Q(headline__contains='bye')).values(), [
+                {"headline": "Hello and goodbye", "id": self.a3, "pub_date": datetime(2005, 11, 29)},
+            ],
+            lambda o: o,
+        )
+
+        self.assertEqual(
+            Article.objects.filter(Q(headline__startswith='Hello')).in_bulk([self.a1, self.a2]),
+            {self.a1: Article.objects.get(pk=self.a1)}
+        )