Refs #21181 -- Corrected DatabaseFeatures.test_collations for Swedish collation.

Previously, backends used different keys "swedish-ci" or "swedish_ci".
This commit is contained in:
Tom Carrick 2020-09-18 12:12:27 +02:00 committed by Mariusz Felisiak
parent f3901b5899
commit 278b6187d2
4 changed files with 4 additions and 4 deletions

View File

@ -306,7 +306,7 @@ class BaseDatabaseFeatures:
test_collations = {
'ci': None, # Case-insensitive.
'cs': None, # Case-sensitive.
'swedish-ci': None # Swedish case-insensitive.
'swedish_ci': None # Swedish case-insensitive.
}
def __init__(self, connection):

View File

@ -46,7 +46,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
order_by_nulls_first = True
test_collations = {
'ci': 'utf8_general_ci',
'swedish-ci': 'utf8_swedish_ci',
'swedish_ci': 'utf8_swedish_ci',
}
@cached_property

View File

@ -59,7 +59,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
has_json_operators = True
json_key_contains_list_matching_requires_list = True
test_collations = {
'swedish-ci': 'sv-x-icu',
'swedish_ci': 'sv-x-icu',
}
@cached_property

View File

@ -31,7 +31,7 @@ class CollateTests(TestCase):
self.assertSequenceEqual(qs, [self.author2, self.author1])
def test_language_collation_order_by(self):
collation = connection.features.test_collations.get('swedish-ci')
collation = connection.features.test_collations.get('swedish_ci')
if not collation:
self.skipTest('This backend does not support language collations.')
author3 = Author.objects.create(alias='O', name='Jones')