diff options
Diffstat (limited to 'django/db/backends/mysql/operations.py')
| -rw-r--r-- | django/db/backends/mysql/operations.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py index 881ada60c7..b47136df26 100644 --- a/django/db/backends/mysql/operations.py +++ b/django/db/backends/mysql/operations.py @@ -44,29 +44,23 @@ class DatabaseOperations(BaseDatabaseOperations): def _convert_field_to_tz(self, field_name, tzname): if settings.USE_TZ: - field_name = "CONVERT_TZ(%s, 'UTC', %%s)" % field_name - params = [tzname] - else: - params = [] - return field_name, params + field_name = "CONVERT_TZ(%s, 'UTC', '%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 = "DATE(%s)" % field_name - return sql, params + field_name = self._convert_field_to_tz(field_name, tzname) + return "DATE(%s)" % field_name def datetime_cast_time_sql(self, field_name, tzname): - field_name, params = self._convert_field_to_tz(field_name, tzname) - sql = "TIME(%s)" % field_name - return sql, params + field_name = self._convert_field_to_tz(field_name, tzname) + return "TIME(%s)" % 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) fields = ['year', 'month', 'day', 'hour', 'minute', 'second'] format = ('%%Y-', '%%m', '-%%d', ' %%H:', '%%i', ':%%s') # Use double percents to escape. format_def = ('0000-', '01', '-01', ' 00:', '00', ':00') @@ -77,7 +71,7 @@ class DatabaseOperations(BaseDatabaseOperations): else: format_str = ''.join([f for f in format[:i]] + [f for f in format_def[i:]]) sql = "CAST(DATE_FORMAT(%s, '%s') AS DATETIME)" % (field_name, format_str) - return sql, params + return sql def time_trunc_sql(self, lookup_type, field_name): fields = { |