From 425718726b7d2edd7b8a043f8976e437262b5098 Mon Sep 17 00:00:00 2001
From: Ipakeev <23178128+ipakeev@users.noreply.github.com>
Date: Mon, 4 Jul 2022 07:37:36 +0300
Subject: [PATCH] Fixed #33816 -- Fixed QuerySet.only() after select_related()
 crash on proxy models.

---
 django/db/models/sql/query.py | 1 +
 tests/proxy_models/tests.py   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 33cc636b2264b..cf7566d7711ce 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -748,6 +748,7 @@ def deferred_to_data(self, target):
                     cur_model = source.related_model
                 else:
                     cur_model = source.remote_field.model
+                cur_model = cur_model._meta.concrete_model
                 opts = cur_model._meta
                 # Even if we're "just passing through" this model, we must add
                 # both the current model's pk and the related reference field
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index f2f465678b514..7caa43d4893a6 100644
--- a/tests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -395,6 +395,12 @@ def test_proxy_load_from_fixture(self):
         p = MyPerson.objects.get(pk=100)
         self.assertEqual(p.name, "Elvis Presley")
 
+    def test_select_related_only(self):
+        user = ProxyTrackerUser.objects.create(name="Joe Doe", status="test")
+        issue = Issue.objects.create(summary="New issue", assignee=user)
+        qs = Issue.objects.select_related("assignee").only("assignee__status")
+        self.assertEqual(qs.get(), issue)
+
     def test_eq(self):
         self.assertEqual(MyPerson(id=100), Person(id=100))