Fixed #26153 -- Reallowed Q-objects in ForeignObject.get_extra_descriptor_filter().

2 files changed, 26 insertions, 0 deletions

diff --git a/tests/foreign_object/models/article.py b/tests/foreign_object/models/article.py
index f0c2f3fbac..6e16784d2c 100644
--- a/tests/foreign_object/models/article.py
+++ b/tests/foreign_object/models/article.py
@@ -44,6 +44,11 @@ class ActiveTranslationField(models.ForeignObject):
         setattr(cls, self.name, ArticleTranslationDescriptor(self))
 
 
+class ActiveTranslationFieldWithQ(ActiveTranslationField):
+    def get_extra_descriptor_filter(self, instance):
+        return models.Q(lang=get_language())
+
+
 @python_2_unicode_compatible
 class Article(models.Model):
     active_translation = ActiveTranslationField(
@@ -54,6 +59,14 @@ class Article(models.Model):
         on_delete=models.CASCADE,
         null=True,
     )
+    active_translation_q = ActiveTranslationFieldWithQ(
+        'ArticleTranslation',
+        from_fields=['id'],
+        to_fields=['article'],
+        related_name='+',
+        on_delete=models.CASCADE,
+        null=True,
+    )
     pub_date = models.DateField()
 
     def __str__(self):
diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py
index bc76ceb93d..a622dfe497 100644
--- a/tests/foreign_object/tests.py
+++ b/tests/foreign_object/tests.py
@@ -458,3 +458,16 @@ class TestModelCheckTests(SimpleTestCase):
             )
 
         self.assertEqual(Child._meta.get_field('parent').check(from_model=Child), [])
+
+
+class TestExtraJoinFilterQ(TestCase):
+    @translation.override('fi')
+    def test_extra_join_filter_q(self):
+        a = Article.objects.create(pub_date=datetime.datetime.today())
+        ArticleTranslation.objects.create(article=a, lang='fi', title='title', body='body')
+        qs = Article.objects.all()
+        with self.assertNumQueries(2):
+            self.assertEqual(qs[0].active_translation_q.title, 'title')
+        qs = qs.select_related('active_translation_q')
+        with self.assertNumQueries(1):
+            self.assertEqual(qs[0].active_translation_q.title, 'title')