diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2017-02-01 14:48:04 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-02-06 09:19:13 -0500 |
| commit | 15c14f6f16af22b970e5693b349113d80f10f82d (patch) | |
| tree | ca3b5b338e53aa376393d23aa7b8e6bea920b1d4 /django/db/backends/postgresql/operations.py | |
| parent | 8b62e5df86088a618339e04469e94ba095723021 (diff) | |
| download | django-15c14f6f16af22b970e5693b349113d80f10f82d.tar.gz | |
Fixed #27802 -- Unified return value of db backend datetime SQL methods.
Diffstat (limited to 'django/db/backends/postgresql/operations.py')
| -rw-r--r-- | django/db/backends/postgresql/operations.py | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py index e612a60ca8..fde02cbb78 100644 --- a/django/db/backends/postgresql/operations.py +++ b/django/db/backends/postgresql/operations.py @@ -32,32 +32,25 @@ class DatabaseOperations(BaseDatabaseOperations): def _convert_field_to_tz(self, field_name, tzname): if settings.USE_TZ: - field_name = "%s AT TIME ZONE %%s" % field_name - params = [tzname] - else: - params = [] - return field_name, params + field_name = "%s AT TIME ZONE '%s'" % (field_name, tzname) + return field_name def datetime_cast_date_sql(self, field_name, tzname): - field_name, params = self._convert_field_to_tz(field_name, tzname) - sql = '(%s)::date' % field_name - return sql, params + field_name = self._convert_field_to_tz(field_name, tzname) + return '(%s)::date' % field_name def datetime_cast_time_sql(self, field_name, tzname): - field_name, params = self._convert_field_to_tz(field_name, tzname) - sql = '(%s)::time' % field_name - return sql, params + field_name = self._convert_field_to_tz(field_name, tzname) + return '(%s)::time' % field_name def datetime_extract_sql(self, lookup_type, field_name, tzname): - field_name, params = self._convert_field_to_tz(field_name, tzname) - sql = self.date_extract_sql(lookup_type, field_name) - return sql, params + field_name = self._convert_field_to_tz(field_name, tzname) + return self.date_extract_sql(lookup_type, field_name) def datetime_trunc_sql(self, lookup_type, field_name, tzname): - field_name, params = self._convert_field_to_tz(field_name, tzname) + field_name = self._convert_field_to_tz(field_name, tzname) # https://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC - sql = "DATE_TRUNC('%s', %s)" % (lookup_type, field_name) - return sql, params + return "DATE_TRUNC('%s', %s)" % (lookup_type, field_name) def time_trunc_sql(self, lookup_type, field_name): return "DATE_TRUNC('%s', %s)::time" % (lookup_type, field_name) |