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

Refs #10929 -- Allowed NowUTC SQL customization for third-party backends.

This commit is contained in:
Tim Graham 2021-08-24 02:28:03 -04:00 committed by GitHub
parent ed317e79e3
commit 022d29c934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/backends/base/features.py
View File

@ -329,6 +329,8 @@ class BaseDatabaseFeatures:
'non_default': None, # Non-default. 'non_default': None, # Non-default.
'swedish_ci': None # Swedish case-insensitive. 'swedish_ci': None # Swedish case-insensitive.
} }
# SQL template override for tests.aggregation.tests.NowUTC
test_now_utc_template = None
# A set of dotted paths to tests in Django's test suite that are expected # A set of dotted paths to tests in Django's test suite that are expected
# to fail on this database. # to fail on this database.

2
django/db/backends/mysql/features.py
View File

@ -60,6 +60,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
'swedish_ci': f'{charset}_swedish_ci', 'swedish_ci': f'{charset}_swedish_ci',
} }
test_now_utc_template = 'UTC_TIMESTAMP'
@cached_property @cached_property
def django_test_skips(self): def django_test_skips(self):
skips = { skips = {

1
django/db/backends/oracle/features.py
View File

@ -72,6 +72,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
'non_default': 'SWEDISH_CI', 'non_default': 'SWEDISH_CI',
'swedish_ci': 'SWEDISH_CI', 'swedish_ci': 'SWEDISH_CI',
} }
test_now_utc_template = "CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"
django_test_skips = { django_test_skips = {
"Oracle doesn't support SHA224.": { "Oracle doesn't support SHA224.": {

1
django/db/backends/postgresql/features.py
View File

@ -62,6 +62,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
'non_default': 'sv-x-icu', 'non_default': 'sv-x-icu',
'swedish_ci': 'sv-x-icu', 'swedish_ci': 'sv-x-icu',
} }
test_now_utc_template = "STATEMENT_TIMESTAMP() AT TIME ZONE 'UTC'"
django_test_skips = { django_test_skips = {
'opclasses are PostgreSQL only.': { 'opclasses are PostgreSQL only.': {

12
tests/aggregation/tests.py
View File

@ -26,14 +26,10 @@ class NowUTC(Now):
template = 'CURRENT_TIMESTAMP' template = 'CURRENT_TIMESTAMP'
output_field = DateTimeField() output_field = DateTimeField()
def as_mysql(self, compiler, connection, **extra_context): def as_sql(self, compiler, connection, **extra_context):
return self.as_sql(compiler, connection, template='UTC_TIMESTAMP', **extra_context) if connection.features.test_now_utc_template:
extra_context['template'] = connection.features.test_now_utc_template
def as_oracle(self, compiler, connection, **extra_context): return super().as_sql(compiler, connection, **extra_context)
return self.as_sql(compiler, connection, template="CURRENT_TIMESTAMP AT TIME ZONE 'UTC'", **extra_context)
def as_postgresql(self, compiler, connection, **extra_context):
return self.as_sql(compiler, connection, template="STATEMENT_TIMESTAMP() AT TIME ZONE 'UTC'", **extra_context)
class AggregateTestCase(TestCase): class AggregateTestCase(TestCase):