p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #25774 -- Made Oracle truncate microseconds if USE_TZ=False. 

The tests for this change are in the fix for #25774.
This commit is contained in:
Josh Smeaton 2016-05-15 21:53:45 +10:00
parent 3630b49b55
commit 77b73e79a4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/db/backends/oracle/operations.py
View File

@ -115,20 +115,19 @@ WHEN (new.%(col_name)s IS NULL)
_tzname_re = re.compile(r'^[\w/:+-]+$') _tzname_re = re.compile(r'^[\w/:+-]+$')
def _convert_field_to_tz(self, field_name, tzname): def _convert_field_to_tz(self, field_name, tzname):
if not settings.USE_TZ: if settings.USE_TZ:
return field_name if not self._tzname_re.match(tzname):
if not self._tzname_re.match(tzname): raise ValueError("Invalid time zone name: %s" % tzname)
raise ValueError("Invalid time zone name: %s" % tzname) # Convert from UTC to local time, returning TIMESTAMP WITH TIME ZONE.
# Convert from UTC to local time, returning TIMESTAMP WITH TIME ZONE. field_name = "(FROM_TZ(%s, '0:00') AT TIME ZONE '%s')" % (field_name, tzname)
result = "(FROM_TZ(%s, '0:00') AT TIME ZONE '%s')" % (field_name, tzname)
# Extracting from a TIMESTAMP WITH TIME ZONE ignore the time zone. # Extracting from a TIMESTAMP WITH TIME ZONE ignore the time zone.
# Convert to a DATETIME, which is called DATE by Oracle. There's no # Convert to a DATETIME, which is called DATE by Oracle. There's no
# built-in function to do that; the easiest is to go through a string. # built-in function to do that; the easiest is to go through a string.
result = "TO_CHAR(%s, 'YYYY-MM-DD HH24:MI:SS')" % result field_name = "TO_CHAR(%s, 'YYYY-MM-DD HH24:MI:SS')" % field_name
result = "TO_DATE(%s, 'YYYY-MM-DD HH24:MI:SS')" % result field_name = "TO_DATE(%s, 'YYYY-MM-DD HH24:MI:SS')" % field_name
# Re-convert to a TIMESTAMP because EXTRACT only handles the date part # Re-convert to a TIMESTAMP because EXTRACT only handles the date part
# on DATE values, even though they actually store the time part. # on DATE values, even though they actually store the time part.
return "CAST(%s AS TIMESTAMP)" % result return "CAST(%s AS TIMESTAMP)" % field_name
def datetime_cast_date_sql(self, field_name, tzname): def datetime_cast_date_sql(self, field_name, tzname):
field_name = self._convert_field_to_tz(field_name, tzname) field_name = self._convert_field_to_tz(field_name, tzname)