Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #8023 -- Allow filtering of DecimalFields (in models) using str…

…ings.

At the same time, checked all other cases of db_prep_value() to ensure they
aren't making the same mistake.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 281f2b74bf19161a0dc5791a07d239ce6a27ed2f 1 parent 1ba2d68
@malcolmt malcolmt authored
View
4 django/db/models/fields/__init__.py
@@ -732,8 +732,8 @@ def format_number(self, value):
return util.format_number(value, self.max_digits, self.decimal_places)
def get_db_prep_value(self, value):
- return connection.ops.value_to_db_decimal(value, self.max_digits,
- self.decimal_places)
+ return connection.ops.value_to_db_decimal(self.to_python(value),
+ self.max_digits, self.decimal_places)
def get_manipulator_field_objs(self):
return [curry(oldforms.DecimalField, max_digits=self.max_digits, decimal_places=self.decimal_places)]
View
17 tests/regressiontests/model_fields/models.py
@@ -1,8 +1,14 @@
from django.db import models
+try:
+ import decimal
+except ImportError:
+ from django.utils import _decimal as decimal # Python 2.3 fallback
+
class Foo(models.Model):
a = models.CharField(max_length=10)
+ d = models.DecimalField(max_digits=5, decimal_places=3)
def get_foo():
return Foo.objects.get(id=1)
@@ -22,14 +28,14 @@ class Whiz(models.Model):
(3,'Third'),
(4,'Fourth'),
)
- ),
+ ),
(0,'Other'),
)
c = models.IntegerField(choices=CHOICES, null=True)
-
+
__test__ = {'API_TESTS':"""
# Create a couple of Places.
->>> f = Foo.objects.create(a='abc')
+>>> f = Foo.objects.create(a='abc', d=decimal.Decimal("12.34"))
>>> f.id
1
>>> b = Bar(b = "bcd")
@@ -67,5 +73,10 @@ class Whiz(models.Model):
>>> w.get_c_display()
u''
+# Regression test for #8023: should be able to filter decimal fields using
+# strings (which is what gets passed through from, e.g., the admin interface).
+>>> Foo.objects.filter(d=u'1.23')
+[]
+
"""}
Please sign in to comment.
Something went wrong with that request. Please try again.