diff options
| author | Tim Graham <timograham@gmail.com> | 2015-11-20 10:31:33 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-21 10:34:01 -0500 |
| commit | 54e2e688e1cfbdb37dfa5dd3b3ffdf2af12b4423 (patch) | |
| tree | ce871cf187117274c4b1b5b9e84a199e985834b1 /django/db | |
| parent | ccc8f67b7760dd12faf6007f12a672a8e03f4d88 (diff) | |
Fixed #25715 -- Fixed Model.refresh_from_db() with ForeignKey w/on_delete=SET_NULL.
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/models/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py index 1dbf0e52e2..149b0e5a42 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -592,7 +592,7 @@ class Model(six.with_metaclass(ModelBase)): rel_instance = getattr(self, field.get_cache_name()) local_val = getattr(db_instance, field.attname) related_val = None if rel_instance is None else getattr(rel_instance, field.target_field.attname) - if local_val != related_val: + if local_val != related_val or (local_val is None and related_val is None): del self.__dict__[field.get_cache_name()] self._state.db = db_instance._state.db |