From ee005328c8eec5c013c6bf9d6fbb2ae9d540df14 Mon Sep 17 00:00:00 2001 From: David-Wobrock Date: Sun, 4 Oct 2020 19:28:21 +0200 Subject: Fixed #31640 -- Made Trunc() truncate datetimes to Date/TimeField in a specific timezone. --- django/db/backends/sqlite3/operations.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'django/db/backends/sqlite3/operations.py') diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py index 1f77b3109f..71ef000c93 100644 --- a/django/db/backends/sqlite3/operations.py +++ b/django/db/backends/sqlite3/operations.py @@ -77,14 +77,22 @@ class DatabaseOperations(BaseDatabaseOperations): """Do nothing since formatting is handled in the custom function.""" return sql - def date_trunc_sql(self, lookup_type, field_name): - return "django_date_trunc('%s', %s)" % (lookup_type.lower(), field_name) + def date_trunc_sql(self, lookup_type, field_name, tzname=None): + return "django_date_trunc('%s', %s, %s, %s)" % ( + lookup_type.lower(), + field_name, + *self._convert_tznames_to_sql(tzname), + ) - def time_trunc_sql(self, lookup_type, field_name): - return "django_time_trunc('%s', %s)" % (lookup_type.lower(), field_name) + def time_trunc_sql(self, lookup_type, field_name, tzname=None): + return "django_time_trunc('%s', %s, %s, %s)" % ( + lookup_type.lower(), + field_name, + *self._convert_tznames_to_sql(tzname), + ) def _convert_tznames_to_sql(self, tzname): - if settings.USE_TZ: + if tzname and settings.USE_TZ: return "'%s'" % tzname, "'%s'" % self.connection.timezone_name return 'NULL', 'NULL' -- cgit v1.3