From e545058ba94f5f5736a5db82e6ba5883d8071485 Mon Sep 17 00:00:00 2001
From: Jacob Kaplan-Moss <jacob@jacobian.org>
Date: Mon, 1 Sep 2008 17:48:39 +0000
Subject: [PATCH] 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.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/backends/mysql/base.py          | 14 ++++++++++++--
 tests/regressiontests/datatypes/models.py | 13 +++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index 9eb8dece83..bda4f8f596 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -172,15 +172,25 @@ class DatabaseOperations(BaseDatabaseOperations):
             return []
 
     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))
 
     def year_lookup_bounds(self, value):
diff --git a/tests/regressiontests/datatypes/models.py b/tests/regressiontests/datatypes/models.py
index 9ebb6402e2..7e76d6a669 100644
--- a/tests/regressiontests/datatypes/models.py
+++ b/tests/regressiontests/datatypes/models.py
@@ -83,3 +83,16 @@ datetime.datetime(2007, 4, 20, 16, 19, 59)
 []
 
 """}
+
+# 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.
+"""