Changeset 8802

Timestamp:

09/01/08 12:48:39 (3 months ago)

Author:

jacob

Message:

Fixed #8354: the MySQL backend no longer raises a cryptic error. Instead, it raises a less-cryptic error. Obiously this isn't a perfect solution by any means, but it'll do until we can revisit timezone handling in the future.

Files:

• django/trunk/django/db/backends/mysql/base.py (modified) (1 diff)
• django/trunk/tests/regressiontests/datatypes/models.py (modified) (1 diff)

django/trunk/django/db/backends/mysql/base.py

@@ -173 +173 @@
-
-    def value_to_db_datetime(self, value):
-        # MySQL doesn't support microseconds
-        if value is None:
-            return None
+        
+        # MySQL doesn't support tz-aware datetimes
+        if value.tzinfo is not None:
+            raise ValueError("MySQL backend does not support timezone-aware datetimes.")
+
+        # MySQL doesn't support microseconds
-        return unicode(value.replace(microsecond=0))
-
-    def value_to_db_time(self, value):
-        # MySQL doesn't support microseconds
-        if value is None:
-            return None
+            
+        # MySQL doesn't support tz-aware datetimes
+        if value.tzinfo is not None:
+            raise ValueError("MySQL backend does not support timezone-aware datetimes.")
+        
+        # MySQL doesn't support microseconds
-        return unicode(value.replace(microsecond=0))
-

django/trunk/tests/regressiontests/datatypes/models.py

@@ -84 +84 @@
-
-"""}
+
+# Regression test for #8354: the MySQL backend should raise an error if given
+# a timezone-aware datetime object.
+if settings.DATABASE_ENGINE == 'mysql':
+    __test__['API_TESTS'] += """
+>>> from django.utils import tzinfo 
+>>> dt = datetime.datetime(2008, 8, 31, 16, 20, tzinfo=tzinfo.FixedOffset(0)) 
+>>> d = Donut(name='Bear claw', consumed_at=dt) 
+>>> d.save()
+Traceback (most recent call last):
+    ....
+ValueError: MySQL backend does not support timezone-aware datetimes.
+"""