-
-
Notifications
You must be signed in to change notification settings - Fork 7.1k
Fix #9750: Respect blank=True when applying uniqueness constraints #9951
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
25punam
wants to merge
4
commits into
encode:main
Choose a base branch
from
25punam:fix-9750-blank-field-required
base: main
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.
+12
−8
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
74f4a97
Fix #9750: Respect blank=True when applying uniqueness constraints
25punam 6be1419
Fix #9750: Respect blank=True when applying uniqueness constraints
25punam 6278cb0
Merge branch 'main' into fix-9750-blank-field-required
auvipy 3226594
Potential fix for pull request finding
auvipy 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1527,18 +1527,22 @@ def get_uniqueness_extra_kwargs(self, field_names, declared_fields, extra_kwargs | |
| default = empty | ||
|
|
||
| if unique_constraint_name in model_fields: | ||
| # The corresponding field is present in the serializer | ||
| if default is empty: | ||
| uniqueness_extra_kwargs[unique_constraint_name] = {'required': True} | ||
| if getattr(unique_constraint_field, "blank", False): | ||
| uniqueness_extra_kwargs[unique_constraint_name] = { | ||
| "required": False, | ||
| "allow_blank": True, | ||
| } | ||
|
Comment on lines
+1531
to
+1535
Collaborator
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. @25punam can you please cross check this and other suggestions? |
||
| if getattr(unique_constraint_field, 'empty_strings_allowed', False): | ||
| uniqueness_extra_kwargs[unique_constraint_name]["default"] = CreateOnlyDefault('') | ||
| else: | ||
| uniqueness_extra_kwargs[unique_constraint_name] = {"required": True} | ||
| else: | ||
| uniqueness_extra_kwargs[unique_constraint_name] = {'default': default} | ||
| uniqueness_extra_kwargs[unique_constraint_name] = {"default": default} | ||
|
|
||
| elif default is not empty: | ||
| # The corresponding field is not present in the | ||
| # serializer. We have a default to use for it, so | ||
| # add in a hidden field that populates it. | ||
| hidden_fields[unique_constraint_name] = HiddenField(default=default) | ||
|
|
||
| # Update `extra_kwargs` with any new options. | ||
|
|
||
|
|
||
| for key, value in uniqueness_extra_kwargs.items(): | ||
| if key in extra_kwargs: | ||
| value.update(extra_kwargs[key]) | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.