Ticket #17: patch

django/db/models/base.py

@@ -14 +14 @@
 from django.utils.functional import curry
 from django.conf import settings
 from itertools import izip
+
 import types
 import sys
 import os
@@ -71 +72 @@
         # registered version.
         return get_model(new_class._meta.app_label, name, False)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 class Model(object):
     __metaclass__ = ModelBase
 
@@ -89 +105 @@
     def __ne__(self, other):
         return not self.__eq__(other)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     def __init__(self, *args, **kwargs):
         dispatcher.send(signal=signals.pre_init, sender=self.__class__, args=args, kwargs=kwargs)
         # there is a rather weird disparity here; if kwargs, it's set, then args overrides it.
@@ -185 +218 @@
         if hasattr(cls, 'get_absolute_url'):
             cls.get_absolute_url = curry(get_absolute_url, opts, cls.get_absolute_url)
 
+
+
         dispatcher.send(signal=signals.class_prepared, sender=cls)
 
     _prepare = classmethod(_prepare)
@@ -241 +276 @@
                 setattr(self, self._meta.pk.attname, backend.get_last_insert_id(cursor, self._meta.db_table, self._meta.pk.column))
         transaction.commit_unless_managed()
 
+
+
+
+
         # Run any post-save hooks.
         dispatcher.send(signal=signals.post_save, sender=self.__class__, instance=self)
 

django/db/models/fields/related.py

@@ -163 +163 @@
                 if self.field.null:
                     return None
                 raise self.field.rel.to.DoesNotExist
-            other_field = self.field.rel.get_related_field()
-            if other_field.rel:
-                params = {'%s__pk' % self.field.rel.field_name: val}
-            else:
-                params = {'%s__exact' % self.field.rel.field_name: val}
-            rel_obj = self.field.rel.to._default_manager.get(**params)
+            rel_obj = self.field.rel.to.get_cached_instance(val)
+            if rel_obj is None:
+                other_field = self.field.rel.get_related_field()
+                if other_field.rel:
+                    params = {'%s__pk' % self.field.rel.field_name: val}
+                else:
+                    params = {'%s__exact' % self.field.rel.field_name: val}
+                rel_obj = self.field.rel.to._default_manager.get(**params)
             setattr(instance, cache_name, rel_obj)
             return rel_obj