diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2017-07-06 13:37:47 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-07-06 07:37:47 -0400 |
| commit | df1106a40ff0cb8946e36e96edb1da6301e0eacd (patch) | |
| tree | 069ca03a0bf5ea3de336d014ea30f69755b2e9f2 /django | |
| parent | 6de2930078d5d13894315c0a88549e6a5e71c701 (diff) | |
Fixed #28365 -- Unified DatabaseOperations.date_interval_sql() return value with similar methods.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/backends/mysql/operations.py | 2 | ||||
| -rw-r--r-- | django/db/backends/oracle/operations.py | 2 | ||||
| -rw-r--r-- | django/db/backends/sqlite3/operations.py | 2 | ||||
| -rw-r--r-- | django/db/models/expressions.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py index 584eb56e70..e7fc2b93bf 100644 --- a/django/db/backends/mysql/operations.py +++ b/django/db/backends/mysql/operations.py @@ -96,7 +96,7 @@ class DatabaseOperations(BaseDatabaseOperations): return "TIME(%s)" % (field_name) def date_interval_sql(self, timedelta): - return "INTERVAL '%06f' SECOND_MICROSECOND" % (timedelta.total_seconds()), [] + return "INTERVAL '%06f' SECOND_MICROSECOND" % timedelta.total_seconds() def format_for_duration_arithmetic(self, sql): if self.connection.features.supports_microsecond_precision: diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index 17c3d93a5c..09c0e18d84 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -77,7 +77,7 @@ END; """ NUMTODSINTERVAL converts number to INTERVAL DAY TO SECOND literal. """ - return "NUMTODSINTERVAL(%06f, 'SECOND')" % (timedelta.total_seconds()), [] + return "NUMTODSINTERVAL(%06f, 'SECOND')" % timedelta.total_seconds() def date_trunc_sql(self, lookup_type, field_name): # https://docs.oracle.com/database/121/SQLRF/functions271.htm#SQLRF52058 diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py index 5ffc65e08a..f030c9ed99 100644 --- a/django/db/backends/sqlite3/operations.py +++ b/django/db/backends/sqlite3/operations.py @@ -54,7 +54,7 @@ class DatabaseOperations(BaseDatabaseOperations): return "django_date_extract('%s', %s)" % (lookup_type.lower(), field_name) def date_interval_sql(self, timedelta): - return "'%s'" % duration_string(timedelta), [] + return "'%s'" % duration_string(timedelta) def format_for_duration_arithmetic(self, sql): """Do nothing since formatting is handled in the custom function.""" diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index e42555ed80..5cd558c12a 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -639,7 +639,7 @@ class DurationValue(Value): connection.ops.check_expression_support(self) if connection.features.has_native_duration_field: return super().as_sql(compiler, connection) - return connection.ops.date_interval_sql(self.value) + return connection.ops.date_interval_sql(self.value), [] class RawSQL(Expression): |