BUG19667984: Fix converting invalid datetime values in Django backend

peeyushgupta · peeyushgupta · commit a57f8855f06d · 2014-10-08T15:24:12.000+05:30
Connector/Python Django backend was raising error while converting an
invalid datetime value instead of returning None. We fix this issue
by adding a check for invalid values.

Unit tests are updated.
diff --git a/lib/mysql/connector/django/base.py b/lib/mysql/connector/django/base.py
@@ -92,6 +92,8 @@ def _DATETIME_to_python(self, value, dsc=None):
         if not value:
             return None
         dt = MySQLConverter._DATETIME_to_python(self, value)
+        if dt is None:
+            return None
         if settings.USE_TZ and timezone.is_naive(dt):
             dt = dt.replace(tzinfo=timezone.utc)
         return dt
diff --git a/tests/test_django.py b/tests/test_django.py
@@ -267,3 +267,16 @@ def test__TIME_to_python(self):
         django_converter = DjangoMySQLConverter()
         self.assertEqual(datetime.time(10, 11, 12),
                          django_converter._TIME_to_python(value, dsc=None))
+
+    def test__DATETIME_to_python(self):
+        value = b'1990-11-12 00:00:00'
+        django_converter = DjangoMySQLConverter()
+        self.assertEqual(datetime.datetime(1990, 11, 12, 0, 0, 0),
+                         django_converter._DATETIME_to_python(value, dsc=None))
+
+        settings.USE_TZ = True
+        value = b'0000-00-00 00:00:00'
+        django_converter = DjangoMySQLConverter()
+        self.assertEqual(None,
+                         django_converter._DATETIME_to_python(value, dsc=None))
+        settings.USE_TZ = False
