summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorcan <cansarigol@derinbilgi.com.tr>2019-06-12 16:35:06 +0300
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-06-13 09:29:43 +0200
commitfde9b7d35e4e185903cc14aa587ca870037941b1 (patch)
tree6f55b844bc14561603e73e9185bc987466e57cac /django/db
parent3dca8738cbbbb5674f795169e5ea25e2002f2d71 (diff)
Fixed #30128 -- Fixed handling timedelta timezone in database functions.
Diffstat (limited to 'django/db')
-rw-r--r--django/db/backends/mysql/operations.py13
-rw-r--r--django/db/backends/oracle/operations.py9
-rw-r--r--django/db/backends/postgresql/operations.py9
-rw-r--r--django/db/backends/sqlite3/base.py8
4 files changed, 36 insertions, 3 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):
diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py
index 77d330c411..6669ca5beb 100644
--- a/django/db/backends/oracle/operations.py
+++ b/django/db/backends/oracle/operations.py
@@ -94,6 +94,13 @@ END;
# This regexp matches all time zone names from the zoneinfo database.
_tzname_re = re.compile(r'^[\w/:+-]+$')
+ 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 not settings.USE_TZ:
return field_name
@@ -106,7 +113,7 @@ END;
return "CAST((FROM_TZ(%s, '%s') AT TIME ZONE '%s') AS TIMESTAMP)" % (
field_name,
self.connection.timezone_name,
- tzname,
+ self._prepare_tzname_delta(tzname),
)
return field_name
diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py
index 66e5482be6..c502760e93 100644
--- a/django/db/backends/postgresql/operations.py
+++ b/django/db/backends/postgresql/operations.py
@@ -40,9 +40,16 @@ class DatabaseOperations(BaseDatabaseOperations):
# https://www.postgresql.org/docs/current/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC
return "DATE_TRUNC('%s', %s)" % (lookup_type, field_name)
+ def _prepare_tzname_delta(self, tzname):
+ if '+' in tzname:
+ return tzname.replace('+', '-')
+ elif '-' in tzname:
+ return tzname.replace('-', '+')
+ return tzname
+
def _convert_field_to_tz(self, field_name, tzname):
if settings.USE_TZ:
- field_name = "%s AT TIME ZONE '%s'" % (field_name, tzname)
+ field_name = "%s AT TIME ZONE '%s'" % (field_name, self._prepare_tzname_delta(tzname))
return field_name
def datetime_cast_date_sql(self, field_name, tzname):
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index 24d07cc11a..f4184fce05 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -408,6 +408,14 @@ def _sqlite_datetime_parse(dt, tzname=None, conn_tzname=None):
if conn_tzname:
dt = dt.replace(tzinfo=pytz.timezone(conn_tzname))
if tzname is not None and tzname != conn_tzname:
+ sign_index = tzname.find('+') + tzname.find('-') + 1
+ if sign_index > -1:
+ sign = tzname[sign_index]
+ tzname, offset = tzname.split(sign)
+ if offset:
+ hours, minutes = offset.split(':')
+ offset_delta = datetime.timedelta(hours=int(hours), minutes=int(minutes))
+ dt += offset_delta if sign == '+' else -offset_delta
dt = timezone.localtime(dt, pytz.timezone(tzname))
return dt