mirror of https://github.com/django/django.git
[2.0.x] Refs #28856 -- Fixed caching of a GenericForeignKey pointing to a model that uses more than one level of MTI.
Forwardport of 3522203502
from stable/1.11.x
This commit is contained in:
parent
6dea1b18f3
commit
5ca9cf47a7
|
@ -234,7 +234,15 @@ class GenericForeignKey(FieldCacheMixin):
|
|||
pk = rel_obj._meta.pk
|
||||
# If the primary key is a remote field, use the referenced
|
||||
# field's to_python().
|
||||
pk_to_python = pk.target_field.to_python if pk.remote_field else pk.to_python
|
||||
to_python_field = pk
|
||||
# Out of an abundance of caution, avoid infinite loops.
|
||||
seen = {to_python_field}
|
||||
while to_python_field.remote_field:
|
||||
to_python_field = to_python_field.target_field
|
||||
if to_python_field in seen:
|
||||
break
|
||||
seen.add(to_python_field)
|
||||
pk_to_python = to_python_field.to_python
|
||||
if pk_to_python(pk_val) != rel_obj._get_pk_val():
|
||||
rel_obj = None
|
||||
else:
|
||||
|
|
|
@ -17,3 +17,7 @@ Bugfixes
|
|||
|
||||
* Fixed incorrect foreign key constraint name for models with quoted
|
||||
``db_table`` (:ticket:`28876`).
|
||||
|
||||
* Fixed a regression in caching of a ``GenericForeignKey`` when the referenced
|
||||
model instance uses more than one level of multi-table inheritance
|
||||
(:ticket:`28856`).
|
||||
|
|
|
@ -17,3 +17,7 @@ Bugfixes
|
|||
|
||||
* Fixed incorrect foreign key constraint name for models with quoted
|
||||
``db_table`` (:ticket:`28876`).
|
||||
|
||||
* Fixed a regression in caching of a ``GenericForeignKey`` when the referenced
|
||||
model instance uses more than one level of multi-table inheritance
|
||||
(:ticket:`28856`).
|
||||
|
|
|
@ -38,6 +38,11 @@ class Restaurant(Place):
|
|||
return "Restaurant: %s" % self.name
|
||||
|
||||
|
||||
class Cafe(Restaurant):
|
||||
def __str__(self):
|
||||
return "Cafe: %s" % self.name
|
||||
|
||||
|
||||
class Address(models.Model):
|
||||
street = models.CharField(max_length=80)
|
||||
city = models.CharField(max_length=50)
|
||||
|
|
|
@ -5,9 +5,10 @@ from django.forms.models import modelform_factory
|
|||
from django.test import TestCase, skipIfDBFeature
|
||||
|
||||
from .models import (
|
||||
A, Address, B, Board, C, CharLink, Company, Contact, Content, D, Developer,
|
||||
Guild, HasLinkThing, Link, Node, Note, OddRelation1, OddRelation2,
|
||||
Organization, Person, Place, Related, Restaurant, Tag, Team, TextLink,
|
||||
A, Address, B, Board, C, Cafe, CharLink, Company, Contact, Content, D,
|
||||
Developer, Guild, HasLinkThing, Link, Node, Note, OddRelation1,
|
||||
OddRelation2, Organization, Person, Place, Related, Restaurant, Tag, Team,
|
||||
TextLink,
|
||||
)
|
||||
|
||||
|
||||
|
@ -53,6 +54,11 @@ class GenericRelationTests(TestCase):
|
|||
CharLink.objects.create(content_object=restaurant)
|
||||
charlink = CharLink.objects.latest('pk')
|
||||
self.assertIs(charlink.content_object, charlink.content_object)
|
||||
# If the model (Cafe) uses more than one level of multi-table inheritance.
|
||||
cafe = Cafe.objects.create()
|
||||
CharLink.objects.create(content_object=cafe)
|
||||
charlink = CharLink.objects.latest('pk')
|
||||
self.assertIs(charlink.content_object, charlink.content_object)
|
||||
|
||||
def test_q_object_or(self):
|
||||
"""
|
||||
|
|
Loading…
Reference in New Issue