Ticket #11850: 11850-test.patch

modeltests/m2m_intermediary/tests.py

@@ -4 +4 @@
 
 from django.test import TestCase
 
-from .models import Reporter, Article, Writer
+from .models import Reporter, Article, Writer, First, Second, Through
 
 
 class M2MIntermediaryTests(TestCase):
@@ -38 +38 @@
             ],
             lambda w: (unicode(w.reporter), w.position)
         )
+
+    def test_intermediary_ordering(self):
+        f = First.objects.create(title='First')
+        # Create out of order, in case pk ordering is 'default' in the DBMS
+        s2 = Second.objects.create(title='Second 2')
+        s3 = Second.objects.create(title='Second 3')
+        s1 = Second.objects.create(title='Second 1')
+
+        t2 = Through.objects.create(first=f, second=s2, order=2)
+        t1 = Through.objects.create(first=f, second=s1, order=1)
+        t3 = Through.objects.create(first=f, second=s2, order=3)
+
+        self.assertQuerysetEqual(
+            f.seconds.all(), [
+                u'Second 1',
+                u'Second 2',
+                u'Second 3',
+            ],
+            lambda w: w.title
+        )

modeltests/m2m_intermediary/models.py

@@ -35 +35 @@
     def __unicode__(self):
         return u'%s (%s)' % (self.reporter, self.position)
 
+class First(models.Model):
+    title = models.CharField(max_length=10)
+    seconds = models.ManyToManyField('Second', through='Through')
+
+class Second(models.Model):
+    title = models.CharField(max_length=10)
+
+class Through(models.Model):
+    first = models.ForeignKey('First')
+    second = models.ForeignKey('Second')
+    order = models.IntegerField()
+
+    class Meta:
+        ordering = ('order',)
+