diff options
| author | can <cansarigol@derinbilgi.com.tr> | 2019-06-12 16:35:06 +0300 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-06-13 09:29:43 +0200 |
| commit | fde9b7d35e4e185903cc14aa587ca870037941b1 (patch) | |
| tree | 6f55b844bc14561603e73e9185bc987466e57cac /django/db/backends/mysql/operations.py | |
| parent | 3dca8738cbbbb5674f795169e5ea25e2002f2d71 (diff) | |
| download | django-fde9b7d35e4e185903cc14aa587ca870037941b1.tar.gz | |
Fixed #30128 -- Fixed handling timedelta timezone in database functions.
Diffstat (limited to 'django/db/backends/mysql/operations.py')
| -rw-r--r-- | django/db/backends/mysql/operations.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py index 231665847a..ef908ad8ae 100644 --- a/django/db/backends/mysql/operations.py +++ b/django/db/backends/mysql/operations.py @@ -69,9 +69,20 @@ class DatabaseOperations(BaseDatabaseOperations): else: return "DATE(%s)" % (field_name) + def _prepare_tzname_delta(self, tzname): + if '+' in tzname: + return tzname[tzname.find('+'):] + elif '-' in tzname: + return tzname[tzname.find('-'):] + return tzname + def _convert_field_to_tz(self, field_name, tzname): if settings.USE_TZ and self.connection.timezone_name != tzname: - field_name = "CONVERT_TZ(%s, '%s', '%s')" % (field_name, self.connection.timezone_name, tzname) + field_name = "CONVERT_TZ(%s, '%s', '%s')" % ( + field_name, + self.connection.timezone_name, + self._prepare_tzname_delta(tzname), + ) return field_name def datetime_cast_date_sql(self, field_name, tzname): |