Skip to content

[pull] main from django:main #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Dec 29, 2025
Merged

[pull] main from django:main #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 57 additions & 46 deletions django/db/models/fields/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,40 +1715,46 @@ def __init__(

def check(self, **kwargs):
errors = super().check(**kwargs)
databases = kwargs.get("databases") or []

digits_errors = [
*self._check_decimal_places(),
*self._check_max_digits(),
*self._check_decimal_places(databases),
*self._check_max_digits(databases),
]
if not digits_errors:
errors.extend(self._check_decimal_places_and_max_digits(**kwargs))
else:
errors.extend(digits_errors)
return errors

def _check_decimal_places(self):
def _check_decimal_places(self, databases):
if self.decimal_places is None:
if (
not connection.features.supports_no_precision_decimalfield
and "supports_no_precision_decimalfield"
not in self.model._meta.required_db_features
):
return [
checks.Error(
"DecimalFields must define a 'decimal_places' attribute.",
obj=self,
id="fields.E130",
)
]
elif self.max_digits is not None:
return [
checks.Error(
"DecimalField’s max_digits and decimal_places must both "
"be defined or both omitted.",
obj=self,
id="fields.E135",
),
]
for db in databases:
if not router.allow_migrate_model(db, self.model):
continue
connection = connections[db]

if (
not connection.features.supports_no_precision_decimalfield
and "supports_no_precision_decimalfield"
not in self.model._meta.required_db_features
):
return [
checks.Error(
"DecimalFields must define a 'decimal_places' attribute.",
obj=self,
id="fields.E130",
)
]
elif self.max_digits is not None:
return [
checks.Error(
"DecimalField’s max_digits and decimal_places must both "
"be defined or both omitted.",
obj=self,
id="fields.E135",
),
]
else:
try:
decimal_places = int(self.decimal_places)
Expand All @@ -1764,29 +1770,34 @@ def _check_decimal_places(self):
]
return []

def _check_max_digits(self):
def _check_max_digits(self, databases):
if self.max_digits is None:
if (
not connection.features.supports_no_precision_decimalfield
and "supports_no_precision_decimalfield"
not in self.model._meta.required_db_features
):
return [
checks.Error(
"DecimalFields must define a 'max_digits' attribute.",
obj=self,
id="fields.E132",
)
]
elif self.decimal_places is not None:
return [
checks.Error(
"DecimalField’s max_digits and decimal_places must both "
"be defined or both omitted.",
obj=self,
id="fields.E135",
),
]
for db in databases:
if not router.allow_migrate_model(db, self.model):
continue
connection = connections[db]

if (
not connection.features.supports_no_precision_decimalfield
and "supports_no_precision_decimalfield"
not in self.model._meta.required_db_features
):
return [
checks.Error(
"DecimalFields must define a 'max_digits' attribute.",
obj=self,
id="fields.E132",
)
]
elif self.decimal_places is not None:
return [
checks.Error(
"DecimalField’s max_digits and decimal_places must both "
"be defined or both omitted.",
obj=self,
id="fields.E135",
),
]
else:
try:
max_digits = int(self.max_digits)
Expand Down
12 changes: 6 additions & 6 deletions tests/invalid_models_tests/test_ordinary_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ class Model(models.Model):
id="fields.E132",
),
]
self.assertEqual(field.check(), expected)
self.assertEqual(field.check(databases=self.databases), expected)

def test_both_attributes_omitted_required_db_features(self):
class Model(models.Model):
Expand All @@ -639,7 +639,7 @@ class Model(models.Model):

field = Model._meta.get_field("field")
self.assertEqual(
field.check(),
field.check(databases=self.databases),
[
Error(
"DecimalField’s max_digits and decimal_places must both "
Expand All @@ -657,7 +657,7 @@ class Model(models.Model):

field = Model._meta.get_field("field")
self.assertEqual(
field.check(),
field.check(databases=self.databases),
[
Error(
"DecimalField’s max_digits and decimal_places must both "
Expand All @@ -674,7 +674,7 @@ class Model(models.Model):

field = Model._meta.get_field("field")
self.assertEqual(
field.check(),
field.check(databases=self.databases),
[
Error(
"'decimal_places' must be a non-negative integer.",
Expand All @@ -695,7 +695,7 @@ class Model(models.Model):

field = Model._meta.get_field("field")
self.assertEqual(
field.check(),
field.check(databases=self.databases),
[
Error(
"'decimal_places' must be a non-negative integer.",
Expand Down Expand Up @@ -731,7 +731,7 @@ class Model(models.Model):
field = models.DecimalField(max_digits=10, decimal_places=10)

field = Model._meta.get_field("field")
self.assertEqual(field.check(), [])
self.assertEqual(field.check(databases=self.databases), [])


@isolate_apps("invalid_models_tests")
Expand Down