diff --git a/django/db/models/base.py b/django/db/models/base.py index 50a701dce2d52..e704db2918847 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -224,12 +224,13 @@ def __init__(self, *args, **kwargs): # keywords, or default. for field in fields_iter: - rel_obj = None + is_related_object = False if kwargs: if isinstance(field.rel, ManyToOneRel): try: # Assume object instance was passed in. rel_obj = kwargs.pop(field.name) + is_related_object = True except KeyError: try: # Object instance wasn't passed in -- must be an ID. @@ -245,11 +246,11 @@ def __init__(self, *args, **kwargs): val = kwargs.pop(field.attname, field.get_default()) else: val = field.get_default() - # If we got passed a related instance, set it using the field.name - # instead of field.attname (e.g. "user" instead of "user_id") so - # that the object gets properly cached (and type checked) by the - # RelatedObjectDescriptor. - if rel_obj: + if is_related_object: + # If we are passed a related instance, set it using the + # field.name instead of field.attname (e.g. "user" instead of + # "user_id") so that the object gets properly cached (and type + # checked) by the RelatedObjectDescriptor. setattr(self, field.name, rel_obj) else: setattr(self, field.attname, val) diff --git a/tests/regressiontests/many_to_one_regress/models.py b/tests/regressiontests/many_to_one_regress/models.py index 2039bd5ddf899..3f35bef62cd3f 100644 --- a/tests/regressiontests/many_to_one_regress/models.py +++ b/tests/regressiontests/many_to_one_regress/models.py @@ -1,5 +1,5 @@ """ -Regression tests for a few FK bugs: #1578, #6886 +Regression tests for a few ForeignKey bugs. """ from django.db import models @@ -106,6 +106,17 @@ def __unicode__(self): ... ValueError: Cannot assign "": "Child.parent" must be a "Parent" instance. +# Nor can you explicitly assign None to Child.parent during object creation +# (regression for #9649). +>>> Child(name='xyzzy', parent=None) +Traceback (most recent call last): + ... +ValueError: Cannot assign None: "Child.parent" does not allow null values. +>>> Child.objects.create(name='xyzzy', parent=None) +Traceback (most recent call last): + ... +ValueError: Cannot assign None: "Child.parent" does not allow null values. + # Creation using keyword argument should cache the related object. >>> p = Parent.objects.get(name="Parent") >>> c = Child(parent=p)