Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
3d85473e
Commit
3d85473e
authored
Feb 18, 2015
by
Aider Ibragimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UniqueTogetherValidator for NULL values
parent
7b639c0c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
rest_framework/validators.py
+3
-1
tests/test_validators.py
+15
-5
No files found.
rest_framework/validators.py
View file @
3d85473e
...
...
@@ -138,7 +138,9 @@ class UniqueTogetherValidator:
queryset
=
self
.
queryset
queryset
=
self
.
filter_queryset
(
attrs
,
queryset
)
queryset
=
self
.
exclude_current_instance
(
attrs
,
queryset
)
if
queryset
.
exists
():
# Ignore validation if any field is None
if
None
not
in
attrs
.
values
()
and
queryset
.
exists
():
field_names
=
', '
.
join
(
self
.
fields
)
raise
ValidationError
(
self
.
message
.
format
(
field_names
=
field_names
))
...
...
tests/test_validators.py
View file @
3d85473e
...
...
@@ -76,8 +76,8 @@ class TestUniquenessValidation(TestCase):
# -----------------------------------
class
UniquenessTogetherModel
(
models
.
Model
):
race_name
=
models
.
CharField
(
max_length
=
100
)
position
=
models
.
IntegerField
()
race_name
=
models
.
CharField
(
max_length
=
100
,
null
=
True
)
position
=
models
.
IntegerField
(
null
=
True
)
class
Meta
:
unique_together
=
(
'race_name'
,
'position'
)
...
...
@@ -108,8 +108,8 @@ class TestUniquenessTogetherValidation(TestCase):
expected
=
dedent
(
"""
UniquenessTogetherSerializer():
id = IntegerField(label='ID', read_only=True)
race_name = CharField(max_length=100, required=True)
position = IntegerField(required=True)
race_name = CharField(
allow_null=True,
max_length=100, required=True)
position = IntegerField(
allow_null=True,
required=True)
class Meta:
validators = [<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>]
"""
)
...
...
@@ -178,10 +178,20 @@ class TestUniquenessTogetherValidation(TestCase):
expected
=
dedent
(
"""
ExcludedFieldSerializer():
id = IntegerField(label='ID', read_only=True)
race_name = CharField(
max_length=100
)
race_name = CharField(
allow_null=True, max_length=100, required=False
)
"""
)
assert
repr
(
serializer
)
==
expected
def
test_ignore_validation_for_null_fields
(
self
):
UniquenessTogetherModel
.
objects
.
create
(
race_name
=
None
,
position
=
None
)
data
=
{
'race_name'
:
None
,
'position'
:
None
}
serializer
=
UniquenessTogetherSerializer
(
data
=
data
)
assert
serializer
.
is_valid
()
# Tests for `UniqueForDateValidator`
# ----------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment