Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
D
django
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
django
Commits
49b4596c
Kaydet (Commit)
49b4596c
authored
Haz 23, 2016
tarafından
Eduard Stepanov
Kaydeden (comit)
Tim Graham
Haz 28, 2016
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fixed #26786 -- Avoided redundant max value validators on integer fields.
üst
c9ae09ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
4 deletions
+41
-4
__init__.py
django/db/models/fields/__init__.py
+12
-4
test_integerfield.py
tests/model_fields/test_integerfield.py
+29
-0
No files found.
django/db/models/fields/__init__.py
Dosyayı görüntüle @
49b4596c
...
...
@@ -1812,14 +1812,22 @@ class IntegerField(Field):
def
validators
(
self
):
# These validators can't be added at field initialization time since
# they're based on values retrieved from `connection`.
range_validators
=
[]
validators_
=
super
(
IntegerField
,
self
)
.
validators
internal_type
=
self
.
get_internal_type
()
min_value
,
max_value
=
connection
.
ops
.
integer_field_range
(
internal_type
)
if
min_value
is
not
None
:
range_validators
.
append
(
validators
.
MinValueValidator
(
min_value
))
for
validator
in
validators_
:
if
isinstance
(
validator
,
validators
.
MinValueValidator
)
and
validator
.
limit_value
>=
min_value
:
break
else
:
validators_
.
append
(
validators
.
MinValueValidator
(
min_value
))
if
max_value
is
not
None
:
range_validators
.
append
(
validators
.
MaxValueValidator
(
max_value
))
return
super
(
IntegerField
,
self
)
.
validators
+
range_validators
for
validator
in
validators_
:
if
isinstance
(
validator
,
validators
.
MaxValueValidator
)
and
validator
.
limit_value
<=
max_value
:
break
else
:
validators_
.
append
(
validators
.
MaxValueValidator
(
max_value
))
return
validators_
def
get_prep_value
(
self
,
value
):
value
=
super
(
IntegerField
,
self
)
.
get_prep_value
(
value
)
...
...
tests/model_fields/test_integerfield.py
Dosyayı görüntüle @
49b4596c
...
...
@@ -90,6 +90,35 @@ class IntegerFieldTests(TestCase):
instance
.
value
=
max_value
instance
.
full_clean
()
def
test_redundant_backend_range_validators
(
self
):
"""
If there are stricter validators than the ones from the database
backend then the backend validators aren't added.
"""
min_backend_value
,
max_backend_value
=
self
.
backend_range
if
min_backend_value
is
not
None
:
min_custom_value
=
min_backend_value
+
1
ranged_value_field
=
self
.
model
.
_meta
.
get_field
(
'value'
)
.
__class__
(
validators
=
[
validators
.
MinValueValidator
(
min_custom_value
)]
)
field_range_message
=
validators
.
MinValueValidator
.
message
%
{
'limit_value'
:
min_custom_value
,
}
with
self
.
assertRaisesMessage
(
ValidationError
,
"[
%
r]"
%
field_range_message
):
ranged_value_field
.
run_validators
(
min_backend_value
-
1
)
if
max_backend_value
is
not
None
:
max_custom_value
=
max_backend_value
-
1
ranged_value_field
=
self
.
model
.
_meta
.
get_field
(
'value'
)
.
__class__
(
validators
=
[
validators
.
MaxValueValidator
(
max_custom_value
)]
)
field_range_message
=
validators
.
MaxValueValidator
.
message
%
{
'limit_value'
:
max_custom_value
,
}
with
self
.
assertRaisesMessage
(
ValidationError
,
"[
%
r]"
%
field_range_message
):
ranged_value_field
.
run_validators
(
max_backend_value
+
1
)
def
test_types
(
self
):
instance
=
self
.
model
(
value
=
0
)
self
.
assertIsInstance
(
instance
.
value
,
six
.
integer_types
)
...
...
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