Ticket #399: 399.diff

django/contrib/admin/views/doc.py

@@ -301 +301 @@
-    'ForeignKey'                : _('Integer'),
-    'ImageField'                : _('File path'),
-    'IntegerField'              : _('Integer'),
+    'BigIntegerField'           : _('Integer'),
-    'IPAddressField'            : _('IP address'),
-    'ManyToManyField'           : '',
-    'NullBooleanField'          : _('Boolean (Either True, False or None)'),
-    'OneToOneField'             : _('Relation to parent model'),
-    'PhoneNumberField'          : _('Phone number'),
-    'PositiveIntegerField'      : _('Integer'),
+    'PositiveBigIntegerField'   : _('Integer'),
-    'PositiveSmallIntegerField' : _('Integer'),
-    'SlugField'                 : _('String (up to %(maxlength)s)'),
-    'SmallIntegerField'         : _('Integer'),

django/db/backends/mysql/creation.py

@@ -14 +14 @@
-    'FloatField':        'numeric(%(max_digits)s, %(decimal_places)s)',
-    'ImageField':        'varchar(100)',
-    'IntegerField':      'integer',
+    'BigIntegerField':   'bigint',
-    'IPAddressField':    'char(15)',
-    'ManyToManyField':   None,
-    'NullBooleanField':  'bool',
-    'OneToOneField':     'integer',
-    'PhoneNumberField':  'varchar(20)',
-    'PositiveIntegerField': 'integer UNSIGNED',
+    'PositiveBigIntegerField': 'bigint UNSIGNED',    
-    'PositiveSmallIntegerField': 'smallint UNSIGNED',
-    'SlugField':         'varchar(%(maxlength)s)',
-    'SmallIntegerField': 'smallint',

django/db/backends/mysql/introspection.py

@@ -83 +83 @@
-    FIELD_TYPE.FLOAT: 'FloatField',
-    FIELD_TYPE.INT24: 'IntegerField',
-    FIELD_TYPE.LONG: 'IntegerField',
-
+Big
-    FIELD_TYPE.SHORT: 'IntegerField',
-    FIELD_TYPE.STRING: 'CharField',
-    FIELD_TYPE.TIMESTAMP: 'DateTimeField',

django/db/models/fields/__init__.py

@@ -729 +729 @@
-        defaults.update(kwargs)
-        return super(IntegerField, self).formfield(**defaults)
-
+class BigIntegerField(IntegerField):
+    def get_manipulator_field_objs(self):
+        return [oldforms.BigIntegerField]
+
+class PositiveBigIntegerField(IntegerField):
+    def get_manipulator_field_objs(self):
+        return [oldforms.PositiveBigIntegerField]    
+
-class IPAddressField(Field):
-    def __init__(self, *args, **kwargs):
-        kwargs['maxlength'] = 15

django/oldforms/__init__.py

@@ -749 +749 @@
-        if not 0 <= int(field_data) <= 32767:
-            raise validators.CriticalValidationError, gettext("Enter a whole number between 0 and 32,767.")
-
+class BigIntegerField(IntegerField):
+    def __init__(self, field_name, length=20, maxlength=None, is_required=False, validator_list=None, member_name=None):
+        if validator_list is None: validator_list = []
+        validator_list = [self.isInteger] + validator_list
+        if member_name is not None:
+            self.member_name = member_name
+        IntegerField.__init__(self, field_name, length, maxlength, is_required, validator_list)
+
+class PositiveBigIntegerField(PositiveIntegerField):
+    def __init__(self, field_name, length=20, maxlength=None, is_required=False, validator_list=None):
+        if validator_list is None: validator_list = []
+        validator_list = [self.isPositive] + validator_list
+        IntegerField.__init__(self, field_name, length, maxlength, is_required, validator_list)
+
-class FloatField(TextField):
-    def __init__(self, field_name, max_digits, decimal_places, is_required=False, validator_list=None):
-        if validator_list is None: validator_list = []

docs/model-api.txt

@@ -126 +126 @@
-automatically be added to your model if you don't specify otherwise. See
-`Automatic primary key fields`_.
-
+``BigIntegerField``
+~~~~~~~~~~~~~~~~
+
+A big integer.
+
+The admin represents this as an ``<input type="text">`` (a single-line input).
+
+It like an ``IntegerField``, except that it fits bigger numbers.
+
-``BooleanField``
-~~~~~~~~~~~~~~~~
-
@@ -353 +362 @@
-A ``CharField`` that checks that the value is a valid U.S.A.-style phone
-number (in the format ``XXX-XXX-XXXX``).
-
+``PositiveBigIntegerField``
+~~~~~~~~~~~~~~~~
+
+Just like a ``BigIntegerField``, but must be positive.
+
-``PositiveIntegerField``
-~~~~~~~~~~~~~~~~~~~~~~~~
-