Skip to content

Commit b2e7a44

Browse files
committed
few cleanups
1 parent 097a426 commit b2e7a44

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

django_mongodb/fields/array.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def check(self, **kwargs):
6868
checks.Error(
6969
"Base field for array cannot be a related field.",
7070
obj=self,
71-
id="postgres.E002",
71+
id="django_mongodb.array.E002",
7272
)
7373
)
7474
else:
@@ -85,7 +85,7 @@ def check(self, **kwargs):
8585
checks.Error(
8686
f"Base field for array has errors:\n {error_messages}",
8787
obj=self,
88-
id="postgres.E001",
88+
id="django_mongodb.array.E001",
8989
)
9090
)
9191
warning_messages = "\n ".join(
@@ -98,7 +98,7 @@ def check(self, **kwargs):
9898
checks.Warning(
9999
f"Base field for array has warnings:\n {warning_messages}",
100100
obj=self,
101-
id="postgres.W004",
101+
id="django_mongodb.array.W004",
102102
)
103103
)
104104
return errors
@@ -112,14 +112,8 @@ def description(self):
112112
return f"Array of {self.base_field.description}"
113113

114114
def db_type(self, connection):
115-
# size = self.size or ""
116-
# return "%s[%s]" % (self.base_field.db_type(connection), size)
117115
return "array"
118116

119-
# def cast_db_type(self, connection):
120-
# size = self.size or ""
121-
# return "%s[%s]" % (self.base_field.cast_db_type(connection), size)
122-
123117
def db_parameters(self, connection):
124118
db_params = super().db_parameters(connection)
125119
db_params["collation"] = self.db_collation

tests/model_fields_/test_arrayfield.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ def test_contains_including_expression(self):
335335
)
336336

337337
def test_icontains(self):
338-
# Using the __icontains lookup with ArrayField is inefficient.
339338
instance = CharArrayModel.objects.create(field=["FoO"])
340339
self.assertSequenceEqual(CharArrayModel.objects.filter(field__icontains="foo"), [instance])
341340

@@ -518,7 +517,7 @@ class MyModel(models.Model):
518517
errors = model.check()
519518
self.assertEqual(len(errors), 1)
520519
# The inner CharField has a non-positive max_length.
521-
self.assertEqual(errors[0].id, "postgres.E001")
520+
self.assertEqual(errors[0].id, "django_mongodb.array.E001")
522521
self.assertIn("max_length", errors[0].msg)
523522

524523
def test_invalid_base_fields(self):
@@ -528,7 +527,7 @@ class MyModel(models.Model):
528527
model = MyModel()
529528
errors = model.check()
530529
self.assertEqual(len(errors), 1)
531-
self.assertEqual(errors[0].id, "postgres.E002")
530+
self.assertEqual(errors[0].id, "django_mongodb.array.E002")
532531

533532
def test_invalid_default(self):
534533
class MyModel(models.Model):
@@ -577,7 +576,7 @@ class MyModel(models.Model):
577576
errors = model.check()
578577
self.assertEqual(len(errors), 1)
579578
# The inner CharField has a non-positive max_length.
580-
self.assertEqual(errors[0].id, "postgres.E001")
579+
self.assertEqual(errors[0].id, "django_mongodb.array.E001")
581580
self.assertIn("max_length", errors[0].msg)
582581

583582
def test_choices_tuple_list(self):

0 commit comments

Comments
 (0)