Ticket #11053: django-onetoonefield.patch

django/db/models/fields/related.py

@@ -188 +188 @@
             return getattr(instance, self.cache_name)
         except AttributeError:
             params = {'%s__pk' % self.related.field.name: instance._get_pk_val()}
-            rel_obj = self.related.model._base_manager.get(**params)
+            try:
+                rel_obj = self.related.model._base_manager.get(**params)
+            except exceptions.ObjectDoesNotExist:
+                if self.related.field.null == False:
+                    raise
+                rel_obj = None
             setattr(instance, self.cache_name, rel_obj)
             return rel_obj
 

tests/regressiontests/one_to_one_regress/models.py

@@ -141 +141 @@
 >>> Target.objects.exclude(pointer2=None)
 []
 
+# return None if the related object does not exist and null=True
+>>> p = Place()
+>>> p.bar
+Traceback (most recent call last):
+    ...
+DoesNotExist: Bar matching query does not exist.
+>>> p.undergroundbar is None
+True
+>>> bar = Bar()
+>>> bar.place is None
+Traceback (most recent call last):
+    ...
+DoesNotExist
+>>> ubar = UndergroundBar()
+>>> ubar.place is None
+True
+
 """}