Avoided creation of deferred model from another deferred model

Also never create deferred model when no attrs are deferred.

1 files changed, 8 insertions, 0 deletions

diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
index be37bc8632..a8699f6334 100644
--- a/django/db/models/query_utils.py
+++ b/django/db/models/query_utils.py
@@ -186,6 +186,14 @@ def deferred_class_factory(model, attrs):
     being replaced with DeferredAttribute objects. The "pk_value" ties the
     deferred attributes to a particular instance of the model.
     """
+    if not attrs:
+        return model
+    # Never create deferred models based on deferred model
+    if model._deferred:
+        # Deferred models are proxies for the non-deferred model. We never
+        # create chains of defers => proxy_for_model is the non-deferred
+        # model.
+        model = model._meta.proxy_for_model
     # The app registry wants a unique name for each model, otherwise the new
     # class won't be created (we get an exception). Therefore, we generate
     # the name using the passed in attrs. It's OK to reuse an existing class