Ticket #11892: 11892.diff

django/db/models/base.py

@@ -336 +336 @@
         return '%s object' % self.__class__.__name__
 
     def __eq__(self, other):
-        return isinstance(other, self.__class__) and self._get_pk_val() == other._get_pk_val()
+        return (isinstance(other, self.__class__) or isinstance(self, other.__class__)) and self._get_pk_val() == other._get_pk_val()
 
     def __ne__(self, other):
         return not self.__eq__(other)

tests/modeltests/defer/models.py

@@ -189 +189 @@
 >>> from django.db.models.loading import cache
 >>> cache.app_models['defer'] = {}
 
+# Model instances of the same type and same ID are considered equal
+# make sure this is true for deferred models as well
+>>> s1 = Secondary.objects.get(first='x1')
+>>> s2 = Secondary.objects.defer('second').get(first='x1')
+>>> s1 == s2
+True
+>>> s2 == s1
+True
+
 """}