-
-
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
Open
sshishov
wants to merge
1
commit into
encode:master
Choose a base branch
from
sshishov:ss/fix/allow-blank-unique-constraint
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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') | ||
|
||
|
||
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 | ||
|
||
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 | ||
models.UniqueConstraint(name='unique_constraint', fields=('age', 'tag'), condition=~models.Q(models.Q(title='') & models.Q(tag='True'))) | ||
] | ||
|
||
|
||
class UniqueConstraintNullableModel(models.Model): | ||
title = models.CharField(max_length=100) | ||
age = models.IntegerField(null=True) | ||
|
@@ -607,6 +661,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 | ||
|
@@ -714,6 +774,12 @@ def test_single_field_uniq_validators(self): | |
ids_in_qs = {frozenset(v.queryset.values_list(flat=True)) for v in validators if hasattr(v, "queryset")} | ||
assert ids_in_qs == {frozenset([1]), frozenset([3])} | ||
|
||
def test_blank_uqnique_constraint_fields_are_not_required(self): | ||
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. Typo here |
||
serializer = UniqueConstraintBlankSerializer(data={'age': 25}) | ||
self.assertTrue(serializer.is_valid(), serializer.errors) | ||
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) | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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?