Ticket #2365: DecimalField-FloatField.diff

django/db/models/fields/__init__.py

@@ -617 +617 @@
-    def get_manipulator_field_objs(self):
-        return [curry(forms.FilePathField, path=self.path, match=self.match, recursive=self.recursive)]
-
-Float
+Decimal
-    empty_strings_allowed = False
-    def __init__(self, verbose_name=None, name=None, max_digits=None, decimal_places=None, **kwargs):
-        self.max_digits, self.decimal_places = max_digits, decimal_places
-        Field.__init__(self, verbose_name, name, **kwargs)
-
+    def to_python(self, value):
+        try:
+            import decimal
+            try:
+                return decimal.Decimal(value)
+            except (decimal.InvalidOperation):
+                raise validators.ValidationError, gettext("This value must be a decimal number.")
+        except ImportError:
+            return str(value)            
+
+    def _format(self, value):
+        if isinstance(value, basestring):
+            return value
+        else:
+            return self.format_number(value)
+    
+    def format_number(self, value):
+        """Formats a number into a string with the requisite number of digits and decimal places."""
+        
+        num_chars = self.max_digits
+        # Allow for a decimal point 
+        if self.decimal_places > 0:
+            num_chars += 1
+        # Allow for a minus sign
+        if value < 0:
+            num_chars += 1
+        
+        return "%.*f" % (self.decimal_places, value)
+
+    def get_db_prep_save(self, value):
+        value = self._format(value)
+
+        return super(DecimalField, self).get_db_prep_save(value)
+
+    def get_db_prep_lookup(self, lookup_type, value):
+        if lookup_type == 'range':
+            value = [self._format(v) for v in value]
+        else:
+            value = self._format(value)
+        return super(DecimalField, self).get_db_prep_lookup(lookup_type, value)
+
-    def get_manipulator_field_objs(self):
-
+
+
-
+class FloatField(Field):
+    empty_strings_allowed = False
+    def __init__(self, verbose_name=None, name=None, **kwargs):
+        Field.__init__(self, verbose_name, name, **kwargs)
+
+    def get_manipulator_field_objs(self):
+        return [forms.FloatField]
+
-class ImageField(FileField):
-    def __init__(self, verbose_name=None, name=None, width_field=None, height_field=None, **kwargs):
-        self.width_field, self.height_field = width_field, height_field

django/db/backends/sqlite3/creation.py

@@ -8 +8 @@
-    'CommaSeparatedIntegerField':   'varchar(%(maxlength)s)',
-    'DateField':                    'date',
-    'DateTimeField':                'datetime',
+    'DecimalField':                 'numeric(%(max_digits)s, %(decimal_places)s)',
-    'FileField':                    'varchar(100)',
-    'FilePathField':                'varchar(100)',
-(%(max_digits)s, %(decimal_places)s)
+
-    'ImageField':                   'varchar(100)',
-    'IntegerField':                 'integer',
-    'IPAddressField':               'char(15)',

django/db/backends/mysql/base.py

@@ -22 +22 @@
-    FIELD_TYPE.DATETIME: util.typecast_timestamp,
-    FIELD_TYPE.DATE: util.typecast_date,
-    FIELD_TYPE.TIME: util.typecast_time,
+    FIELD_TYPE.DECIMAL: None,
+    FIELD_TYPE.NEWDECIMAL: None
-})
-
+
-# This is an extra debug layer over MySQL queries, to display warnings.
-# It's only used when DEBUG=True.
-class MysqlDebugWrapper:

django/db/backends/mysql/introspection.py

@@ -75 +75 @@
-DATA_TYPES_REVERSE = {
-    FIELD_TYPE.BLOB: 'TextField',
-    FIELD_TYPE.CHAR: 'CharField',
-
+
+
-    FIELD_TYPE.DATE: 'DateField',
-    FIELD_TYPE.DATETIME: 'DateTimeField',
-    FIELD_TYPE.DOUBLE: 'FloatField',

django/db/backends/mysql/creation.py

@@ -9 +9 @@
-    'CommaSeparatedIntegerField': 'varchar(%(maxlength)s)',
-    'DateField':         'date',
-    'DateTimeField':     'datetime',
+    'DecimalField':      'decimal(%(max_digits)s, %(decimal_places)s)',
-    'FileField':         'varchar(100)',
-    'FilePathField':     'varchar(100)',
-numeric(%(max_digits)s, %(decimal_places)s)
+double
-    'ImageField':        'varchar(100)',
-    'IntegerField':      'integer',
-    'IPAddressField':    'char(15)',

django/forms/__init__.py

@@ -739 +739 @@
-            raise validators.CriticalValidationError, gettext("Enter a whole number between 0 and 32,767.")
-
-class FloatField(TextField):
+    def __init__(self, field_name, is_required=False, validator_list=None):
+        if validator_list is None: validator_list = []
+        validator_list = [validators.isValidFloat] + validator_list
+        TextField.__init__(self, field_name, is_required=is_required, validator_list=validator_list)
+
+    def html2python(data):
+        if data == '' or data is None:
+            return None
+        return float(data)
+    html2python = staticmethod(html2python)
+
+class DecimalField(TextField):
-    def __init__(self, field_name, max_digits, decimal_places, is_required=False, validator_list=None):
-        if validator_list is None: validator_list = []
-        self.max_digits, self.decimal_places = max_digits, decimal_places
-
-
+
+
+
-
-Float
-Float
+Decimal
+Decimal
-        try:
-            v(field_data, all_data)
-        except validators.ValidationError, e:
@@ -755 +768 @@
-    def html2python(data):
-        if data == '' or data is None:
-            return None
-
+
+
+
+
+
+
+
+
-    html2python = staticmethod(html2python)
-
-####################

django/core/validators.py

@@ -24 +24 @@
-    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
-    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
-    r')@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}$', re.IGNORECASE)  # domain
+decimal_re = re.compile(r'^-?(?P<digits>\d+)(\.(?P<decimals>\d+))?$')
-integer_re = re.compile(r'^-?\d+$')
-ip4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$')
-phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
@@ -342 +343 @@
-        if val != int(val):
-            raise ValidationError, gettext("This value must be a power of %s.") % self.power_of
-
-Float
+Decimal
-    def __init__(self, max_digits, decimal_places):
-        self.max_digits, self.decimal_places = max_digits, decimal_places
-
-    def __call__(self, field_data, all_data):
-
-
-
-
+
+
-            raise ValidationError, gettext("Please enter a valid decimal number.")
-
+
+
+
+
+
-            raise ValidationError, ngettext("Please enter a valid decimal number with at most %s total digit.",
-                "Please enter a valid decimal number with at most %s total digits.", self.max_digits) % self.max_digits
-(not '.' in data and len(data) > (self.max_digits - self.decimal_places)) or ('.' in data and len(data) > (self.max_digits - (self.decimal_places - len(data.split('.')[1])) + 1)
+digits > (self.max_digits - self.decimal_places
-            raise ValidationError, ngettext( "Please enter a valid decimal number with a whole part of at most %s digit.",
-                "Please enter a valid decimal number with a whole part of at most %s digits.", str(self.max_digits-self.decimal_places)) % str(self.max_digits-self.decimal_places)
-'.' in data and len(data.split('.')[1])
+decimals
-            raise ValidationError, ngettext("Please enter a valid decimal number with at most %s decimal place.",
-                "Please enter a valid decimal number with at most %s decimal places.", self.decimal_places) % self.decimal_places
-
+def isValidFloat(field_data, all_data):
+    data = str(field_data)
+    try:
+        float(data)
+    except ValueError:
+        raise ValidationError, gettext("Please enter a valid floating point number.")
+
-class HasAllowableSize(object):
-    """
-    Checks that the file-upload field data is a certain size. min_size and

django/core/management.py

@@ -756 +756 @@
-                if field_type == 'CharField' and row[3]:
-                    extra_params['maxlength'] = row[3]
-
-Float
+Decimal
-                    extra_params['max_digits'] = row[4]
-                    extra_params['decimal_places'] = row[5]
-
@@ -830 +830 @@
-                e.add(opts, '"%s": You can\'t use "id" as a field name, because each model automatically gets an "id" field if none of the fields have primary_key=True. You need to either remove/rename your "id" field or add primary_key=True to a field.' % f.name)
-            if isinstance(f, models.CharField) and f.maxlength in (None, 0):
-                e.add(opts, '"%s": CharFields require a "maxlength" attribute.' % f.name)
-Float
+Decimal
-                if f.decimal_places is None:
-Float
+Decimal
-                if f.max_digits is None:
-Float
+Decimal
-            if isinstance(f, models.FileField) and not f.upload_to:
-                e.add(opts, '"%s": FileFields require an "upload_to" attribute.' % f.name)
-            if isinstance(f, models.ImageField):

django/contrib/admin/templatetags/admin_list.py

@@ -149 +149 @@
-            elif isinstance(f, models.BooleanField) or isinstance(f, models.NullBooleanField):
-                BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
-                result_repr = '<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val)
-Float
-Float
+Decimal
+Decimal
-                if field_val is not None:
-                    result_repr = ('%%.%sf' % f.decimal_places) % field_val
-                else:

django/contrib/admin/views/doc.py

@@ -294 +294 @@
-    'CommaSeparatedIntegerField': _('Comma-separated integers'),
-    'DateField'                 : _('Date (without time)'),
-    'DateTimeField'             : _('Date (with time)'),
+    'DecimalField'              : _('Decimal number'),
-    'EmailField'                : _('E-mail address'),
-    'FileField'                 : _('File path'),
-    'FilePathField'             : _('File path'),
-Decimal
+Floating point
-    'ForeignKey'                : _('Integer'),
-    'ImageField'                : _('File path'),
-    'IntegerField'              : _('Integer'),

tests/modeltests/invalid_models/models.py

@@ -8 +8 @@
-
-class FieldErrors(models.Model):
-    charfield = models.CharField()
-floatfield = models.Float
+decimalfield = models.Decimal
-    filefield = models.FileField()
-    prepopulate = models.CharField(maxlength=10, prepopulate_from='bad')
-    choices = models.CharField(maxlength=10, choices='bad')
@@ -79 +79 @@
-
-
-error_log = """invalid_models.fielderrors: "charfield": CharFields require a "maxlength" attribute.
-floatfield": Float
-floatfield": Float
+decimalfield": Decimal
+decimalfield": Decimal
-invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.
-invalid_models.fielderrors: "prepopulate": prepopulate_from should be a list or tuple.
-invalid_models.fielderrors: "choices": "choices" should be iterable (e.g., a tuple or list).

docs/forms.txt

@@ -503 +503 @@
-    * isNotEmpty
-    * isOnlyDigits
-    * isNotOnlyDigits
-
+    
-    * isOnlyLetters
-    * isValidANSIDate
-    * isValidANSITime
-    * isValidEmail
+    * isValidFloat    
-    * isValidImage
-    * isValidImageURL
-    * isValidPhone
@@ -588 +589 @@
-    Takes an integer argument and when called as a validator, checks that the
-    field being validated is a power of the integer.
-
-Float
+Decimal
-    Takes a maximum number of digits and number of decimal places (in that
-float with less
-
+decimal with no more
+s
-
+``IsValidFloat``
+    Takes a string argument and validates whether it can be converted to a
+    float.
+
-``MatchesRegularExpression``
-    Takes a regular expression (a string) as a parameter and validates the
-    field value against it.