Ticket #15790: 15790_only_broken_for_proxy_models.diff

django/db/models/sql/query.py

@@ -544 +544 @@
         columns = set()
         orig_opts = self.model._meta
         seen = {}
-        must_include = {self.model: set([orig_opts.pk])}
+        if orig_opts.proxy:
+            must_include = {orig_opts.proxy_for_model: set([orig_opts.pk])}
+        else:
+            must_include = {self.model: set([orig_opts.pk])}
         for field_name in field_names:
             parts = field_name.split(LOOKUP_SEP)
             cur_model = self.model

tests/regressiontests/defer_regress/tests.py

@@ -7 +7 @@
 from django.db.models.loading import cache
 from django.test import TestCase
 
-from models import ResolveThis, Item, RelatedItem, Child, Leaf
+from models import ResolveThis, Item, RelatedItem, Child, Leaf, Proxy
 
 
 class DeferRegressionTest(TestCase):
@@ -111 +111 @@
                 Child,
                 Item,
                 Leaf,
+                Proxy,
                 RelatedItem,
                 ResolveThis,
             ]
@@ -139 +140 @@
                 "Leaf_Deferred_name_value",
                 "Leaf_Deferred_second_child_value",
                 "Leaf_Deferred_value",
+                "Proxy",
                 "RelatedItem",
                 "RelatedItem_Deferred_",
                 "RelatedItem_Deferred_item_id",
@@ -146 +148 @@
             ]
         )
 
+        # Regression for #15790 - only() broken for proxy models
+        proxy = Proxy.objects.create(name="proxy", value=42)
+        deferredproxy = Proxy.objects.only('other_value').get(pk=proxy.pk)
+        self.assertEqual(deferredproxy.name, proxy.name)
+        self.assertEqual(deferredproxy.value, proxy.value)
+
     def test_resolve_columns(self):
         rt = ResolveThis.objects.create(num=5.0, name='Foobar')
         qs = ResolveThis.objects.defer('num')

tests/regressiontests/defer_regress/models.py

@@ -34 +34 @@
 class ResolveThis(models.Model):
     num = models.FloatField()
     name = models.CharField(max_length=16)
+
+class Proxy(Item):
+    class Meta:
+        proxy = True