summaryrefslogtreecommitdiff
path: root/tests/model_fields
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2023-11-01 20:43:16 -0400
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-11-02 15:48:31 +0100
commitb735b90f439a964bda20a3ded19a39c5f0ce9b9a (patch)
tree331454c52c0eb8d535651bcbbb557b6f691682ce /tests/model_fields
parentbf8aac36796165ad6688364089572e642f3a1bd4 (diff)
[5.0.x] Refs #31300 -- Allowed testing GeneratedField without collation.
CockroachDB and Snowflake don't support it. Backport of 208870b6122c4cbc39c3b2432e13db54c920db51 from main
Diffstat (limited to 'tests/model_fields')
-rw-r--r--tests/model_fields/models.py12
-rw-r--r--tests/model_fields/test_generatedfield.py7
2 files changed, 4 insertions, 15 deletions
diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index b966da59e5..7804c19881 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -20,7 +20,7 @@ except ImportError:
test_collation = SimpleLazyObject(
- lambda: connection.features.test_collations.get("non_default")
+ lambda: connection.features.test_collations["virtual"]
)
@@ -529,10 +529,7 @@ class GeneratedModelOutputField(models.Model):
)
class Meta:
- required_db_features = {
- "supports_stored_generated_columns",
- "supports_collation_on_charfield",
- }
+ required_db_features = {"supports_stored_generated_columns"}
class GeneratedModelOutputFieldVirtual(models.Model):
@@ -544,10 +541,7 @@ class GeneratedModelOutputFieldVirtual(models.Model):
)
class Meta:
- required_db_features = {
- "supports_virtual_generated_columns",
- "supports_collation_on_charfield",
- }
+ required_db_features = {"supports_virtual_generated_columns"}
class GeneratedModelNull(models.Model):
diff --git a/tests/model_fields/test_generatedfield.py b/tests/model_fields/test_generatedfield.py
index d965940465..a37e374981 100644
--- a/tests/model_fields/test_generatedfield.py
+++ b/tests/model_fields/test_generatedfield.py
@@ -165,12 +165,8 @@ class GeneratedFieldTestMixin:
with self.assertNumQueries(0), self.assertRaises(does_not_exist):
self.base_model.objects.get(field__gte=overflow_value)
- @skipUnlessDBFeature("supports_collation_on_charfield")
def test_output_field(self):
- collation = connection.features.test_collations.get("non_default")
- if not collation:
- self.skipTest("Language collations are not supported.")
-
+ collation = connection.features.test_collations["virtual"]
m = self.output_field_model.objects.create(name="NAME")
field = m._meta.get_field("lower_name")
db_parameters = field.db_parameters(connection)
@@ -181,7 +177,6 @@ class GeneratedFieldTestMixin:
field._resolved_expression.output_field.db_type(connection),
)
- @skipUnlessDBFeature("supports_collation_on_charfield")
def test_db_type_parameters(self):
db_type_parameters = self.output_field_model._meta.get_field(
"lower_name"