summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-02-28 17:35:13 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-02-28 17:35:13 +0100
commit0c82b1dfc48b4870e8fbcfb782ae02cdca821e1f (patch)
tree3c8825b2883c688c5a8987d60199e0dcaba93c73 /django
parentcf304691649fbe3b0d7f8e9396358be9df62430f (diff)
Fixed #19929 -- Improved error when MySQL doesn't have TZ definitions.
Thanks tomas_00 for the report.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/sql/compiler.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index b9d25d98a1..7ddee9785c 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -1057,6 +1057,10 @@ class SQLDateTimeCompiler(SQLCompiler):
# Datetimes are artifically returned in UTC on databases that
# don't support time zone. Restore the zone used in the query.
if settings.USE_TZ:
+ if datetime is None:
+ raise ValueError("Database returned an invalid value "
+ "in QuerySet.dates(). Are time zone "
+ "definitions installed?")
datetime = datetime.replace(tzinfo=None)
datetime = timezone.make_aware(datetime, self.query.tzinfo)
yield datetime