Ticket #20487: 20487.diff

tests/queries/models.py

@@ -449 +449 @@
         return "category item: " + str(self.category)
 
 
+class OtherCategoryItem(models.Model):
+    Category = models.ForeignKey('SimpleCategory', models.CASCADE)
+
+
+class CommonForeignKey(models.Model):
+    category = models.ForeignKey(CategoryItem, models.CASCADE)
+    other_category = models.ForeignKey(OtherCategoryItem, models.CASCADE)
+
+
 class OneToOneCategory(models.Model):
     new_name = models.CharField(max_length=15)
     category = models.OneToOneField(SimpleCategory, models.CASCADE)

tests/queries/tests.py

@@ -15 +15 @@
 from .models import (
     FK1, Annotation, Article, Author, BaseA, Book, CategoryItem,
     CategoryRelationship, Celebrity, Channel, Chapter, Child, ChildObjectA,
-    Classroom, Company, Cover, CustomPk, CustomPkTag, Detail, DumbCategory,
-    Eaten, Employment, ExtraInfo, Fan, Food, Identifier, Individual, Item, Job,
-    JobResponsibilities, Join, LeafA, LeafB, LoopX, LoopZ, ManagedModel,
-    Member, ModelA, ModelB, ModelC, ModelD, MyObject, NamedCategory, Node,
-    Note, NullableName, Number, ObjectA, ObjectB, ObjectC, OneToOneCategory,
-    Order, OrderItem, Page, Paragraph, Person, Plaything, PointerA, Program,
-    ProxyCategory, ProxyObjectA, ProxyObjectB, Ranking, Related,
-    RelatedIndividual, RelatedObject, Report, ReportComment, ReservedName,
-    Responsibility, School, SharedConnection, SimpleCategory, SingleObject,
-    SpecialCategory, Staff, StaffUser, Student, Tag, Task, Teacher,
-    Ticket21203Child, Ticket21203Parent, Ticket23605A, Ticket23605B,
-    Ticket23605C, TvChef, Valid, X,
+    Classroom, CommonForeignKey, Company, Cover, CustomPk, CustomPkTag, Detail,
+    DumbCategory, Eaten, Employment, ExtraInfo, Fan, Food, Identifier,
+    Individual, Item, Job, JobResponsibilities, Join, LeafA, LeafB, LoopX,
+    LoopZ, ManagedModel, Member, ModelA, ModelB, ModelC, ModelD, MyObject,
+    NamedCategory, Node, Note, NullableName, Number, ObjectA, ObjectB, ObjectC,
+    OneToOneCategory, Order, OrderItem, OtherCategoryItem, Page, Paragraph,
+    Person, Plaything, PointerA, Program, ProxyCategory, ProxyObjectA,
+    ProxyObjectB, Ranking, Related, RelatedIndividual, RelatedObject, Report,
+    ReportComment, ReservedName, Responsibility, School, SharedConnection,
+    SimpleCategory, SingleObject, SpecialCategory, Staff, StaffUser, Student,
+    Tag, Task, Teacher, Ticket21203Child, Ticket21203Parent, Ticket23605A,
+    Ticket23605B, Ticket23605C, TvChef, Valid, X,
 )
 
 
@@ -1172 +1172 @@
         with self.assertRaisesMessage(FieldError, msg):
             Tag.objects.filter(unknown_field__name='generic')
 
+    def test_common_related_model(self):
+        c1 = SimpleCategory.objects.create(name='c1')
+        c2 = SimpleCategory.objects.create(name='c2')
+        category = CategoryItem.objects.create(category=c1)
+        other_category = OtherCategoryItem.objects.create(Category=c2)
+        CommonForeignKey.objects.create(category=category, other_category=other_category)
+        qs = CommonForeignKey.objects.values(
+            'category', 'other_category', 'category__category', 'other_category__Category',
+        )
+        self.assertTrue(qs[:20].exists())
+
 
 class Queries2Tests(TestCase):
     @classmethod