-
-
Notifications
You must be signed in to change notification settings - Fork 7k
fix(blank/unique): add default handling for blank=True field
#9751
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -149,6 +149,14 @@ class Meta: | |||||
| unique_together = ('race_name', 'position') | ||||||
|
|
||||||
|
|
||||||
| class BlankUniquenessTogetherModel(models.Model): | ||||||
| race_name = models.CharField(max_length=100, blank=True) | ||||||
| position = models.IntegerField() | ||||||
|
|
||||||
| class Meta: | ||||||
| unique_together = ('race_name', 'position') | ||||||
|
|
||||||
|
Comment on lines
+152
to
+158
|
||||||
|
|
||||||
| class NullUniquenessTogetherModel(models.Model): | ||||||
| """ | ||||||
| Used to ensure that null values are not included when checking | ||||||
|
|
@@ -176,6 +184,12 @@ class Meta: | |||||
| fields = '__all__' | ||||||
|
|
||||||
|
|
||||||
| class BlankUniquenessTogetherSerializer(serializers.ModelSerializer): | ||||||
| class Meta: | ||||||
| model = BlankUniquenessTogetherModel | ||||||
| fields = '__all__' | ||||||
|
|
||||||
|
|
||||||
| class NullUniquenessTogetherSerializer(serializers.ModelSerializer): | ||||||
| class Meta: | ||||||
| model = NullUniquenessTogetherModel | ||||||
|
|
@@ -461,6 +475,34 @@ def test_do_not_ignore_validation_for_null_fields(self): | |||||
| serializer = NullUniquenessTogetherSerializer(data=data) | ||||||
| assert not serializer.is_valid() | ||||||
|
|
||||||
| def test_validation_for_provided_blank_fields(self): | ||||||
| BlankUniquenessTogetherModel.objects.create( | ||||||
| position=1 | ||||||
| ) | ||||||
| data = { | ||||||
| 'race_name': '', | ||||||
| 'position': 1 | ||||||
| } | ||||||
| serializer = BlankUniquenessTogetherSerializer(data=data) | ||||||
| assert not serializer.is_valid() | ||||||
|
|
||||||
| def test_validation_for_missing_blank_fields(self): | ||||||
| BlankUniquenessTogetherModel.objects.create( | ||||||
| position=1 | ||||||
| ) | ||||||
| data = { | ||||||
| 'position': 1 | ||||||
| } | ||||||
| serializer = BlankUniquenessTogetherSerializer(data=data) | ||||||
| assert not serializer.is_valid() | ||||||
|
|
||||||
| def test_ignore_validation_for_missing_blank_fields(self): | ||||||
| data = { | ||||||
| 'position': 1 | ||||||
| } | ||||||
| serializer = BlankUniquenessTogetherSerializer(data=data) | ||||||
| assert serializer.is_valid(), serializer.errors | ||||||
|
|
||||||
|
Comment on lines
+489
to
+505
|
||||||
| def test_ignore_validation_for_unchanged_fields(self): | ||||||
| """ | ||||||
| If all fields in the unique together constraint are unchanged, | ||||||
|
|
@@ -589,6 +631,18 @@ class Meta: | |||||
| ] | ||||||
|
|
||||||
|
|
||||||
| class UniqueConstraintBlankModel(models.Model): | ||||||
| title = models.CharField(max_length=100, blank=True) | ||||||
| age = models.IntegerField() | ||||||
| tag = models.CharField(max_length=100, blank=True) | ||||||
|
|
||||||
| class Meta: | ||||||
| constraints = [ | ||||||
| # Unique constraint on 2 blank fields | ||||||
|
||||||
| # Unique constraint on 2 blank fields | |
| # Unique constraint on one required field (age) and one blank field (tag) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't we have a char length limit here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo here
Copilot
AI
Dec 14, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo in test method name: "uqnique" should be "unique".
| def test_blank_uqnique_constraint_fields_are_not_required(self): | |
| def test_blank_unique_constraint_fields_are_not_required(self): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we split it into multiple assertions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider adding a field type check before setting default to empty string. The Django blank attribute is primarily meaningful for text fields (CharField, TextField). For other field types with blank=True, setting default='' could cause type errors. While this is an edge case (as non-text fields with blank=True typically also have null=True or an explicit default, which are handled earlier in the condition chain), adding a check like
isinstance(unique_constraint_field, (models.CharField, models.TextField))would make the code more defensive and consistent with the pattern in utils/field_mapping.py lines 133-134.