Ticket #8119: 8119.diff

django/db/models/manager.py

@@ -54 +54 @@
     def get_empty_query_set(self):
         return EmptyQuerySet(self.model)
 
+    def get_full_query_set(self):
+        """Returns a new QuerySet object containing all records. Subclasses can
+        override this method to customize queryset instances but it's required
+        that they return all records.
+        """
+        return QuerySet(self.model)
+
     def get_query_set(self):
         """Returns a new QuerySet object.  Subclasses can override this method
-        to easily customize the behavior of the Manager.
+        to add custom filters to queryset instances.
         """
-        return QuerySet(self.model)
+        return self.get_full_query_set()
 
     def none(self):
         return self.get_empty_query_set()
@@ -81 +88 @@
     def get(self, *args, **kwargs):
         return self.get_query_set().get(*args, **kwargs)
 
+    def get_full(self, *args, **kwargs):
+        """Used to access parent related objects ensuring that they're
+        not affected by any filters.
+        """
+        return self.get_full_query_set().get(*args, **kwargs)
+
     def get_or_create(self, **kwargs):
         return self.get_query_set().get_or_create(**kwargs)
 

django/db/models/fields/related.py

@@ -2 +2 @@
 from django.db.models import signals, get_model
 from django.db.models.fields import AutoField, Field, IntegerField, PositiveIntegerField, PositiveSmallIntegerField, FieldDoesNotExist
 from django.db.models.related import RelatedObject
-from django.db.models.query import QuerySet
 from django.db.models.query_utils import QueryWrapper
 from django.utils.translation import ugettext_lazy, string_concat, ungettext, ugettext as _
 from django.utils.functional import curry
@@ -239 +238 @@
                 params = {'%s__pk' % self.field.rel.field_name: val}
             else:
                 params = {'%s__exact' % self.field.rel.field_name: val}
-            rel_obj = QuerySet(self.field.rel.to).get(**params)
+            rel_obj = self.field.rel.to._default_manager.get_full(**params)
             setattr(instance, cache_name, rel_obj)
             return rel_obj