-
-
Notifications
You must be signed in to change notification settings - Fork 7.1k
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
8de6a6c
1e23e2b
2c5f53c
c6bea61
247531b
ca72094
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,22 @@ 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 one required field (age) and one blank field (tag) | ||
| models.UniqueConstraint( | ||
| name='unique_constraint', | ||
| fields=('age', 'tag'), | ||
| condition=~models.Q(tag=''), | ||
| ) | ||
| ] | ||
|
|
||
|
|
||
| class UniqueConstraintReadOnlyFieldModel(models.Model): | ||
| state = models.CharField(max_length=100, default="new") | ||
| position = models.IntegerField() | ||
|
|
@@ -642,6 +700,12 @@ class Meta: | |
| fields = '__all__' | ||
|
|
||
|
|
||
| class UniqueConstraintBlankSerializer(serializers.ModelSerializer): | ||
| class Meta: | ||
| model = UniqueConstraintBlankModel | ||
| fields = ('title', 'age', 'tag') | ||
|
|
||
|
|
||
| class UniqueConstraintNullableSerializer(serializers.ModelSerializer): | ||
| class Meta: | ||
| model = UniqueConstraintNullableModel | ||
|
|
@@ -755,6 +819,12 @@ def test_single_field_uniq_validators(self): | |
| ids_in_qs = {frozenset(v.queryset.values_list('id', flat=True)) for v in validators if hasattr(v, "queryset")} | ||
| assert ids_in_qs == {frozenset([1]), frozenset([3])} | ||
|
|
||
| def test_blank_unique_constraint_fields_are_not_required(self): | ||
| serializer = UniqueConstraintBlankSerializer(data={'age': 25}) | ||
| self.assertTrue(serializer.is_valid(), serializer.errors) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we split it into multiple assertions? |
||
| result = serializer.save() | ||
| self.assertIsInstance(result, UniqueConstraintBlankModel) | ||
|
|
||
| def test_nullable_unique_constraint_fields_are_not_required(self): | ||
| serializer = UniqueConstraintNullableSerializer(data={'title': 'Bob'}) | ||
| self.assertTrue(serializer.is_valid(), serializer.errors) | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.