Skip to content

Fix regression in unique_together validation with SerializerMethodField#9712

Merged
browniebroke merged 1 commit intoencode:masterfrom
kalekseev:fix-9700
Jun 10, 2025
Merged

Fix regression in unique_together validation with SerializerMethodField#9712
browniebroke merged 1 commit intoencode:masterfrom
kalekseev:fix-9700

Conversation

@kalekseev
Copy link
Contributor

@kalekseev kalekseev commented May 31, 2025 •
edited by browniebroke
Loading

While building validator unique together fields were compared with declared field names instead of model field names

fixes #9700

closes #9710

@kalekseev kalekseev mentioned this pull request Jun 1, 2025
Closed
auvipy
auvipy reviewed Jun 2, 2025
View reviewed changes
Copy link
Collaborator

@auvipy auvipy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

@auvipy auvipy mentioned this pull request Jun 2, 2025
Open
browniebroke
browniebroke reviewed Jun 2, 2025
View reviewed changes
@kalekseev
Fix unique together validation.
d4e4043 
While building validator unique together fields were compared with
declared field names instead of model field names
@kalekseev kalekseev requested a review from browniebroke June 3, 2025 05:34
@kalekseev
Copy link
Contributor Author

kalekseev commented Jun 3, 2025

It also possible to unify code related to get_unique_together_constraints, these two code blocks are basically the same

django-rest-framework/rest_framework/serializers.py

Lines 1600 to 1604 in 33d59fe

for unique_together, queryset, condition_fields, condition in self.get_unique_together_constraints(self.Meta.model):
# Skip if serializer does not map to all unique together sources
unique_together_and_condition_fields = set(unique_together) | set(condition_fields)
if not set(source_map).issuperset(unique_together_and_condition_fields):
continue

django-rest-framework/rest_framework/serializers.py

Lines 1475 to 1478 in 33d59fe

for unique_together_list, queryset, condition_fields, condition in self.get_unique_together_constraints(model):
unique_together_list_and_condition_fields = set(unique_together_list) | set(condition_fields)
if set(field_names).issuperset(unique_together_list_and_condition_fields):
unique_constraint_names |= unique_together_list_and_condition_fields

@auvipy
Copy link
Collaborator

auvipy commented Jun 5, 2025

you can come with the unified code for review as well

@browniebroke browniebroke changed the title Fix unique together validation. Fix regression in unique_together validation with SerializerMethodField Jun 5, 2025
browniebroke
browniebroke approved these changes Jun 5, 2025
View reviewed changes
Copy link
Member

@browniebroke browniebroke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my perspective, I'm happy to get it merge this as is. Thanks for picking it up

auvipy
auvipy reviewed Jun 9, 2025
View reviewed changes
Copy link
Collaborator

@auvipy auvipy left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I think should be merged for now

@browniebroke browniebroke merged commit e454758 into encode:master Jun 10, 2025
7 checks passed
@browniebroke
Copy link
Member

browniebroke commented Jun 10, 2025

Thanks!

@claude claude bot mentioned this pull request Feb 24, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@auvipy auvipy auvipy left review comments

@browniebroke browniebroke browniebroke approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

SerializerMethodField issue after "unique together validator" fix

3 participants

@kalekseev @auvipy @browniebroke