mirror of https://github.com/django/django.git
Fixed in master byb68212f539
. Forwardport of290c9d6654
from stable/1.8.x
This commit is contained in:
parent
f7b2978158
commit
7c7b855106
|
@ -20,3 +20,8 @@ Bugfixes
|
|||
|
||||
* Fixed incorrect GROUP BY clause generation on MySQL when the query's model
|
||||
has a self-referential foreign key (:ticket:`24748`).
|
||||
|
||||
* Implemented ``ForeignKey.get_db_prep_value()`` so that ``ForeignKey``\s
|
||||
pointing to :class:`~django.db.models.UUIDField` and inheritance on models
|
||||
with ``UUIDField`` primary keys work correctly (:ticket:`24698`,
|
||||
:ticket:`24712`).
|
||||
|
|
|
@ -373,3 +373,11 @@ class PrimaryKeyUUIDModel(models.Model):
|
|||
|
||||
class RelatedToUUIDModel(models.Model):
|
||||
uuid_fk = models.ForeignKey('PrimaryKeyUUIDModel')
|
||||
|
||||
|
||||
class UUIDChild(PrimaryKeyUUIDModel):
|
||||
pass
|
||||
|
||||
|
||||
class UUIDGrandchild(UUIDChild):
|
||||
pass
|
||||
|
|
|
@ -6,7 +6,8 @@ from django.db import models
|
|||
from django.test import TestCase
|
||||
|
||||
from .models import (
|
||||
NullableUUIDModel, PrimaryKeyUUIDModel, RelatedToUUIDModel, UUIDModel,
|
||||
NullableUUIDModel, PrimaryKeyUUIDModel, RelatedToUUIDModel, UUIDGrandchild,
|
||||
UUIDModel,
|
||||
)
|
||||
|
||||
|
||||
|
@ -146,3 +147,7 @@ class TestAsPrimaryKey(TestCase):
|
|||
RelatedToUUIDModel.objects.update(uuid_fk=u2.pk)
|
||||
r.refresh_from_db()
|
||||
self.assertEqual(r.uuid_fk, u2)
|
||||
|
||||
def test_two_level_foreign_keys(self):
|
||||
# exercises ForeignKey.get_db_prep_value()
|
||||
UUIDGrandchild().save()
|
||||
|
|
Loading…
Reference in New Issue