Ticket #2365: DecimalField.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 get_manipulator_field_objs(self):
-Float
+Decimal
-
-class ImageField(FileField):
-    def __init__(self, verbose_name=None, name=None, width_field=None, height_field=None, **kwargs):

django/db/backends/ado_mssql/creation.py

@@ -7 +7 @@
-    'DateTimeField':     'smalldatetime',
-    'FileField':         'varchar(100)',
-    'FilePathField':     'varchar(100)',
-FloatField':  
+DecimalField':
-    'ImageField':        'varchar(100)',
-    'IntegerField':      'int',
-    'IPAddressField':    'char(15)',

django/db/backends/postgresql/introspection.py

@@ -80 +80 @@
-    1114: 'DateTimeField',
-    1184: 'DateTimeField',
-    1266: 'TimeField',
-Float
+Decimal
-}

django/db/backends/postgresql/creation.py

@@ -11 +11 @@
-    'DateTimeField':     'timestamp with time zone',
-    'FileField':         'varchar(100)',
-    'FilePathField':     'varchar(100)',
-FloatField':  
+DecimalField':
-    'ImageField':        'varchar(100)',
-    'IntegerField':      'integer',
-    'IPAddressField':    'inet',

django/db/backends/sqlite3/creation.py

@@ -10 +10 @@
-    'DateTimeField':                'datetime',
-    'FileField':                    'varchar(100)',
-    'FilePathField':                'varchar(100)',
-FloatField':  
+DecimalField':
-    'ImageField':                   'varchar(100)',
-    'IntegerField':                 'integer',
-    'IPAddressField':               'char(15)',

django/db/backends/mysql/introspection.py

@@ -76 +76 @@
-DATA_TYPES_REVERSE = {
-    FIELD_TYPE.BLOB: 'TextField',
-    FIELD_TYPE.CHAR: 'CharField',
-Float
+Decimal
-    FIELD_TYPE.DATE: 'DateField',
-    FIELD_TYPE.DATETIME: 'DateTimeField',
-Float
-Float
+Decimal
+Decimal
-    FIELD_TYPE.INT24: 'IntegerField',
-    FIELD_TYPE.LONG: 'IntegerField',
-    FIELD_TYPE.LONGLONG: 'IntegerField',

django/db/backends/mysql/creation.py

@@ -11 +11 @@
-    'DateTimeField':     'datetime',
-    'FileField':         'varchar(100)',
-    'FilePathField':     'varchar(100)',
-FloatField':  
+DecimalField':
-    'ImageField':        'varchar(100)',
-    'IntegerField':      'integer',
-    'IPAddressField':    'char(15)',

django/db/backends/oracle/introspection.py

@@ -48 +48 @@
-    1114: 'DateTimeField',
-    1184: 'DateTimeField',
-    1266: 'TimeField',
-Float
+Decimal
-}

django/db/backends/oracle/creation.py

@@ -7 +7 @@
-    'DateTimeField':     'date',
-    'FileField':         'varchar2(100)',
-    'FilePathField':     'varchar2(100)',
-FloatField':  
+DecimalField':
-    'ImageField':        'varchar2(100)',
-    'IntegerField':      'integer',
-    'IPAddressField':    'char(15)',

django/db/backends/postgresql_psycopg2/introspection.py

@@ -80 +80 @@
-    1114: 'DateTimeField',
-    1184: 'DateTimeField',
-    1266: 'TimeField',
-Float
+Decimal
-}

django/forms/__init__.py

@@ -736 +736 @@
-        if not 0 <= int(field_data) <= 32767:
-            raise validators.CriticalValidationError, gettext("Enter a whole number between 0 and 32,767.")
-
-Float
+Decimal
-    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

django/core/management.py

@@ -757 +757 @@
-                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]
-
@@ -831 +831 @@
-                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

@@ -151 +151 @@
-            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

@@ -297 +297 @@
-    'EmailField'                : _('E-mail address'),
-    'FileField'                 : _('File path'),
-    'FilePathField'             : _('File path'),
-FloatField'  
+DecimalField'
-    '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).