pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #462 from bool-dev/master

Browse Source 
Fixes #458, DecimalField now ignores incorrect values until validate is called just like FloatField
This commit is contained in:
Ross Lawley 2013-09-27 08:41:32 -07:00
commit 1145c72b01
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mongoengine/fields.py
View File

@ -304,7 +304,10 @@ class DecimalField(BaseField):
return value return value
# Convert to string for python 2.6 before casting to Decimal # Convert to string for python 2.6 before casting to Decimal
try:
value = decimal.Decimal("%s" % value) value = decimal.Decimal("%s" % value)
except decimal.InvalidOperation:
return value
return value.quantize(self.precision, rounding=self.rounding) return value.quantize(self.precision, rounding=self.rounding)
def to_mongo(self, value): def to_mongo(self, value):

8
tests/fields/fields.py
View File

@ -384,6 +384,9 @@ class FieldTest(unittest.TestCase):
person.height = 4.0 person.height = 4.0
self.assertRaises(ValidationError, person.validate) self.assertRaises(ValidationError, person.validate)
person_2 = Person(height='something invalid')
self.assertRaises(ValidationError, person_2.validate)
def test_decimal_validation(self): def test_decimal_validation(self):
"""Ensure that invalid values cannot be assigned to decimal fields. """Ensure that invalid values cannot be assigned to decimal fields.
""" """
@ -405,6 +408,11 @@ class FieldTest(unittest.TestCase):
self.assertRaises(ValidationError, person.validate) self.assertRaises(ValidationError, person.validate)
person.height = Decimal('4.0') person.height = Decimal('4.0')
self.assertRaises(ValidationError, person.validate) self.assertRaises(ValidationError, person.validate)
person.height = 'something invalid'
self.assertRaises(ValidationError, person.validate)
person_2 = Person(height='something invalid')
self.assertRaises(ValidationError, person_2.validate)
Person.drop_collection() Person.drop_collection()