Ticket #10516: testcase.diff

tests/regressiontests/queries/tests.py

@@ -1 +1 @@
 import unittest
-from models import Tag, Annotation
+from models import Tag, Annotation, Recommendation, Recommender
+from django.db.models.query import QuerySet, Q
 from django.db.models import Count
+import operator
 
 class QuerysetOrderedTests(unittest.TestCase):
     """
@@ -24 +26 @@
         qs = Annotation.objects.annotate(num_notes=Count('notes'))
         self.assertEqual(qs.ordered, False)
         self.assertEqual(qs.order_by('num_notes').ordered, True)
-        
- No newline at end of file
+
+class QuerysetMergingTests(unittest.TestCase):
+    """
+    Tests for merging Querysets that have been filtered on multiple elements from the same
+    base class
+    """
+     
+    def runTest(self):
+        match = Recommendation.objects.get(recommender__titletranslation__text__icontains='ar')
+
+        qs = Recommendation._default_manager.get_query_set()
+        
+        search_fields = [
+            'titletranslation__text__icontains',
+            'recommender__titletranslation__text__icontains'
+        ]
+        
+        or_queries = [Q(**{field: u'ar'}) for field in search_fields]
+        
+        other_qs = QuerySet(Recommendation)
+        other_qs.dup_select_related(qs)
+        other_qs = other_qs.filter(reduce(operator.or_, or_queries))
+        
+        self.assert_(match in qs & other_qs)
+ No newline at end of file

tests/regressiontests/queries/fixtures/initial_data.json

@@ +1 @@
+[{"pk": 1, "model": "queries.title", "fields": {}}, {"pk": 2, "model": "queries.title", "fields": {}}, {"pk": 3, "model": "queries.title", "fields": {}}, {"pk": 4, "model": "queries.title", "fields": {}}, {"pk": 1, "model": "queries.titletranslation", "fields": {"lang": "FI", "text": "Bar", "title": 1}}, {"pk": 2, "model": "queries.titletranslation", "fields": {"lang": "FI", "text": "Foo", "title": 2}}, {"pk": 3, "model": "queries.titletranslation", "fields": {"lang": "FI", "text": "Few", "title": 3}}, {"pk": 4, "model": "queries.titletranslation", "fields": {"lang": "FI", "text": "Bas", "title": 4}}, {"pk": 1, "model": "queries.recommender", "fields": {}}, {"pk": 4, "model": "queries.recommender", "fields": {}}, {"pk": 2, "model": "queries.recommendation", "fields": {"recommender": 1}}, {"pk": 3, "model": "queries.recommendation", "fields": {"recommender": 4}}]

tests/regressiontests/queries/models.py

@@ -271 +271 @@
     def __unicode__(self):
         return self.name
 
+# a base class for Recommender and Recommendation
+class Title(models.Model):
+  def __unicode__(self):
+    try:
+      return self.titletranslation_set.filter(lang="FI")[0].text
+    except:
+      return "No finnish name defined!"
 
+LANG_CHOICES = (('FI', 'Finnish'), ('EN', 'English'),)
+
+class TitleTranslation(models.Model):
+  title = models.ForeignKey(Title)
+  text = models.CharField(max_length = 100)
+  lang = models.CharField(max_length = 2, choices = LANG_CHOICES)
+
+class Recommender(Title):
+  pass 
+
+class Recommendation(Title):
+  recommender = models.ForeignKey(Recommender)
+
+
 __test__ = {'API_TESTS':"""
 >>> generic = NamedCategory.objects.create(name="Generic")
 >>> t1 = Tag.objects.create(name='t1', category=generic)