summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMichaƂ Modzelewski <michal.modzelewski@gmail.com>2015-01-02 02:47:49 +0100
committerTim Graham <timograham@gmail.com>2015-01-07 08:33:26 -0500
commitee86e590516250a7db7bf7c9a979ced4faf4edd7 (patch)
treecdc31e7108030b8497728dfdfe1e7e0a2bfe0bff /django
parent5a4ac4ead986387216e0c0e1b4d4b6a537f87e0b (diff)
Refs #2443 -- Allowed creation of objects with NULL DurationFields
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index e090dc625a..5d34137bf2 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -1651,6 +1651,8 @@ class DurationField(Field):
def get_db_prep_value(self, value, connection, prepared=False):
if connection.features.has_native_duration_field:
return value
+ if value is None:
+ return None
return value.total_seconds() * 1000000
def get_db_converters(self, connection):