Ticket #11890: 11890-extra-select-related-r16522.diff

tests/regressiontests/defer_regress/tests.py

@@ -4 +4 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sessions.backends.db import SessionStore
 from django.db import connection
-from django.db.models import Count
+from django.db.models import Count, Sum
 from django.db.models.loading import cache
 from django.test import TestCase
 
-from models import ResolveThis, Item, RelatedItem, Child, Leaf, Proxy
+from models import ResolveThis, Item, RelatedItem, Child, Leaf, Proxy, Candy, Person
 
 
 class DeferRegressionTest(TestCase):
+    maxDiff = None
+
     def test_basic(self):
         # Deferred fields should really be deferred and not accidentally use
         # the field's default value just because they aren't passed to __init__
@@ -109 +111 @@
         )
         self.assertEqual(
             klasses, [
+                Candy,
                 Child,
                 Item,
                 Leaf,
+                Person,
                 Proxy,
                 RelatedItem,
                 ResolveThis,
@@ -128 +132 @@
         )
         self.assertEqual(
             klasses, [
+                "Candy",
                 "Child",
                 "Child_Deferred_value",
                 "Item",
@@ -141 +146 @@
                 "Leaf_Deferred_name_value",
                 "Leaf_Deferred_second_child_value",
                 "Leaf_Deferred_value",
+                "Person",
                 "Proxy",
                 "RelatedItem",
                 "RelatedItem_Deferred_",
@@ -173 +179 @@
         qs = ResolveThis.objects.defer('num')
         self.assertEqual(1, qs.count())
         self.assertEqual('Foobar', qs[0].name)
+
+    def test_11890(self):
+        # Rather interestingly, all those select_related and defer are required to 
+        # trigger some edge case behaviour
+        p = Person.objects.create(first_name='Mr', last_name='Egotistic')
+        p.best_friend = p
+        p.save()
+        for n in xrange(10):
+            Candy.objects.create(owner=p, qty=42)
+        self.assertEqual(Candy.objects.aggregate(Sum('qty'))['qty__sum'], 378)
+        self.assertEqual(Person.objects.annotate(Sum('candies__qty')).select_related('best_friend').defer('first_name','best_friend__nick_name').get(pk=p.pk).candies__qty__sum, 378)

tests/regressiontests/defer_regress/models.py

@@ -38 +38 @@
 class Proxy(Item):
     class Meta:
         proxy = True
+
+# Models for 11890 -- do not change since bug includes a really
+# esoteric edge case
+class Person(models.Model):
+    first_name = models.CharField(max_length=200)
+    last_name = models.CharField(max_length=50)
+    best_friend = models.ForeignKey('self', blank=True, null=True, editable=False)
+        
+    nick_name = models.CharField(max_length=50, blank=True, null=True)
+
+class Candy(models.Model):
+    owner = models.ForeignKey(Person, related_name="candies")
+    qty = models.PositiveIntegerField(default=0)