diff options
author | Anssi Kääriäinen <anssi.kaariainen@thl.fi> | 2016-01-20 11:05:48 +0200 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-01-20 19:13:05 -0500 |
commit | ee596888e1149864e7828f5cf63c0eda395744c3 (patch) | |
tree | 253a10367482c35c32fa47fa91bdbaaca7987a02 /tests/m2m_through | |
parent | 2d28144c9519f4e4397c70f045c2b1d31437bf69 (diff) | |
download | django-ee596888e1149864e7828f5cf63c0eda395744c3.tar.gz |
Fixed #26092 -- Fixed QuerySet.order_by() regression with an M2M through model.
Diffstat (limited to 'tests/m2m_through')
-rw-r--r-- | tests/m2m_through/models.py | 1 | ||||
-rw-r--r-- | tests/m2m_through/tests.py | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tests/m2m_through/models.py b/tests/m2m_through/models.py index c25303f6f5..dab3be5164 100644 --- a/tests/m2m_through/models.py +++ b/tests/m2m_through/models.py @@ -65,6 +65,7 @@ class CustomMembership(models.Model): class Meta: db_table = "test_table" + ordering = ["date_joined"] class TestNoDefaultsOrNulls(models.Model): diff --git a/tests/m2m_through/tests.py b/tests/m2m_through/tests.py index badaeb4b87..40753e0fe1 100644 --- a/tests/m2m_through/tests.py +++ b/tests/m2m_through/tests.py @@ -198,6 +198,20 @@ class M2mThroughTests(TestCase): attrgetter("name") ) + def test_order_by_relational_field_through_model(self): + CustomMembership.objects.create(person=self.jim, group=self.rock) + CustomMembership.objects.create(person=self.bob, group=self.rock) + CustomMembership.objects.create(person=self.jane, group=self.roll) + CustomMembership.objects.create(person=self.jim, group=self.roll) + self.assertQuerysetEqual( + self.rock.custom_members.order_by('custom_person_related_name'), + [self.jim, self.bob], lambda x: x + ) + self.assertQuerysetEqual( + self.roll.custom_members.order_by('custom_person_related_name'), + [self.jane, self.jim], lambda x: x + ) + def test_query_first_model_by_intermediate_model_attribute(self): Membership.objects.create( person=self.jane, group=self.roll, |