Fixed #27594 -- Fixed select_related() with reverse self-referential OneToOneField.
Fixed definition of `klass_info['from_parent']` so that two models aren't considered from a parent class if the model classes are the same.
This commit is contained in:
parent
2e9fa516fd
commit
7da37699e8
|
@ -713,7 +713,7 @@ class SQLCompiler(object):
|
||||||
|
|
||||||
_, _, _, joins, _ = self.query.setup_joins([related_field_name], opts, root_alias)
|
_, _, _, joins, _ = self.query.setup_joins([related_field_name], opts, root_alias)
|
||||||
alias = joins[-1]
|
alias = joins[-1]
|
||||||
from_parent = issubclass(model, opts.model)
|
from_parent = issubclass(model, opts.model) and model is not opts.model
|
||||||
klass_info = {
|
klass_info = {
|
||||||
'model': model,
|
'model': model,
|
||||||
'field': f,
|
'field': f,
|
||||||
|
|
|
@ -102,3 +102,12 @@ class Child3(Child2):
|
||||||
|
|
||||||
class Child4(Child1):
|
class Child4(Child1):
|
||||||
value4 = models.IntegerField()
|
value4 = models.IntegerField()
|
||||||
|
|
||||||
|
|
||||||
|
class LinkedList(models.Model):
|
||||||
|
name = models.CharField(max_length=50)
|
||||||
|
previous_item = models.OneToOneField(
|
||||||
|
'self', models.CASCADE,
|
||||||
|
related_name='next_item',
|
||||||
|
blank=True, null=True,
|
||||||
|
)
|
||||||
|
|
|
@ -4,8 +4,9 @@ from django.core.exceptions import FieldError
|
||||||
from django.test import SimpleTestCase, TestCase
|
from django.test import SimpleTestCase, TestCase
|
||||||
|
|
||||||
from .models import (
|
from .models import (
|
||||||
AdvancedUserStat, Child1, Child2, Child3, Child4, Image, Parent1, Parent2,
|
AdvancedUserStat, Child1, Child2, Child3, Child4, Image, LinkedList,
|
||||||
Product, StatDetails, User, UserProfile, UserStat, UserStatResult,
|
Parent1, Parent2, Product, StatDetails, User, UserProfile, UserStat,
|
||||||
|
UserStatResult,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -207,6 +208,13 @@ class ReverseSelectRelatedTestCase(TestCase):
|
||||||
self.assertEqual(p.child1.name1, 'n1')
|
self.assertEqual(p.child1.name1, 'n1')
|
||||||
self.assertEqual(p.child1.child4.name1, 'n1')
|
self.assertEqual(p.child1.child4.name1, 'n1')
|
||||||
|
|
||||||
|
def test_self_relation(self):
|
||||||
|
item1 = LinkedList.objects.create(name='item1')
|
||||||
|
LinkedList.objects.create(name='item2', previous_item=item1)
|
||||||
|
with self.assertNumQueries(1):
|
||||||
|
item1_db = LinkedList.objects.select_related('next_item').get(name='item1')
|
||||||
|
self.assertEqual(item1_db.next_item.name, 'item2')
|
||||||
|
|
||||||
|
|
||||||
class ReverseSelectRelatedValidationTests(SimpleTestCase):
|
class ReverseSelectRelatedValidationTests(SimpleTestCase):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue