diff options
author | Jon Dufresne <jon.dufresne@gmail.com> | 2020-02-18 20:09:48 -0800 |
---|---|---|
committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-03-19 12:57:07 +0100 |
commit | 013147fae2b9168b06c495aa78c10725cab294cd (patch) | |
tree | 1b176e0c3a78b46396d25ff81a756f10ed7e5032 /tests/model_inheritance | |
parent | 142ab6846ac09d6d401e26fc8b6b988a583ac0f5 (diff) | |
download | django-013147fae2b9168b06c495aa78c10725cab294cd.tar.gz |
Fixed #31285 -- Fixed inherited Meta.ordering of "-pk".
Diffstat (limited to 'tests/model_inheritance')
-rw-r--r-- | tests/model_inheritance/models.py | 2 | ||||
-rw-r--r-- | tests/model_inheritance/tests.py | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/tests/model_inheritance/models.py b/tests/model_inheritance/models.py index a4f9cfe696..58c076d536 100644 --- a/tests/model_inheritance/models.py +++ b/tests/model_inheritance/models.py @@ -181,6 +181,8 @@ class GrandParent(models.Model): place = models.ForeignKey(Place, models.CASCADE, null=True, related_name='+') class Meta: + # Ordering used by test_inherited_ordering_pk_desc. + ordering = ['-pk'] unique_together = ('first_name', 'last_name') diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py index 4252f3a301..3568c538f0 100644 --- a/tests/model_inheritance/tests.py +++ b/tests/model_inheritance/tests.py @@ -7,7 +7,7 @@ from django.test.utils import CaptureQueriesContext, isolate_apps from .models import ( Base, Chef, CommonInfo, GrandChild, GrandParent, ItalianRestaurant, - MixinModel, ParkingLot, Place, Post, Restaurant, Student, SubBase, + MixinModel, Parent, ParkingLot, Place, Post, Restaurant, Student, SubBase, Supplier, Title, Worker, ) @@ -204,6 +204,19 @@ class ModelInheritanceTests(TestCase): self.assertEqual(A.attr.called, (A, 'attr')) + def test_inherited_ordering_pk_desc(self): + p1 = Parent.objects.create(first_name='Joe', email='joe@email.com') + p2 = Parent.objects.create(first_name='Jon', email='jon@email.com') + expected_order_by_sql = 'ORDER BY %s.%s DESC' % ( + connection.ops.quote_name(Parent._meta.db_table), + connection.ops.quote_name( + Parent._meta.get_field('grandparent_ptr').column + ), + ) + qs = Parent.objects.all() + self.assertSequenceEqual(qs, [p2, p1]) + self.assertIn(expected_order_by_sql, str(qs.query)) + class ModelInheritanceDataTests(TestCase): @classmethod |