Ticket #399: bigint-patch-20091215.diff

django/db/models/fields/__init__.py

@@ -743 +743 @@
         defaults.update(kwargs)
         return super(IntegerField, self).formfield(**defaults)
 
+class BigIntegerField(IntegerField):
+    MAX_BIGINT = 9223372036854775807
+    empty_strings_allowed = False
+    def get_internal_type(self):
+        return "BigIntegerField"
+
+    def get_db_prep_save(self, value):
+        if value is not None:
+            value = long(value)
+            if value > BigIntegerField.MAX_BIGINT or value < -BigIntegerField.MAX_BIGINT - 1:
+                raise ValueError("Value is to small/large to fit this field")
+        return super(BigIntegerField, self).get_db_prep_save(value)
+
+    def formfield(self, **kwargs):
+        defaults = {'min_value': -BigIntegerField.MAX_BIGINT - 1,
+                    'max_value': BigIntegerField.MAX_BIGINT}
+        defaults.update(kwargs)
+        return super(BigIntegerField, self).formfield(**defaults)
+
+
 class IPAddressField(Field):
     """IP address"""
     

django/db/backends/postgresql/introspection.py

@@ -4 +4 @@
     # Maps type codes to Django Field types.
     data_types_reverse = {
         16: 'BooleanField',
+        20: 'BigIntegerField',
         21: 'SmallIntegerField',
         23: 'IntegerField',
         25: 'TextField',

django/db/backends/postgresql/creation.py

@@ -18 +18 @@
         'FilePathField':     'varchar(%(max_length)s)',
         'FloatField':        'double precision',
         'IntegerField':      'integer',
+        'BigIntegerField':   'bigint',
         'IPAddressField':    'inet',
         'NullBooleanField':  'boolean',
         'OneToOneField':     'integer',

django/db/backends/sqlite3/introspection.py

@@ -16 +16 @@
         'smallinteger': 'SmallIntegerField',
         'int': 'IntegerField',
         'integer': 'IntegerField',
+        'bigint': 'BigIntegerField',
         'integer unsigned': 'PositiveIntegerField',
         'decimal': 'DecimalField',
         'real': 'FloatField',

django/db/backends/sqlite3/creation.py

@@ -19 +19 @@
         'FilePathField':                'varchar(%(max_length)s)',
         'FloatField':                   'real',
         'IntegerField':                 'integer',
+        'BigIntegerField':                 'bigint',
         'IPAddressField':               'char(15)',
         'NullBooleanField':             'bool',
         'OneToOneField':                'integer',

django/db/backends/mysql/introspection.py

@@ -17 +17 @@
         FIELD_TYPE.FLOAT: 'FloatField',
         FIELD_TYPE.INT24: 'IntegerField',
         FIELD_TYPE.LONG: 'IntegerField',
-        FIELD_TYPE.LONGLONG: 'IntegerField',
+        FIELD_TYPE.LONGLONG: 'BigIntegerField',
         FIELD_TYPE.SHORT: 'IntegerField',
         FIELD_TYPE.STRING: 'CharField',
         FIELD_TYPE.TIMESTAMP: 'DateTimeField',

django/db/backends/mysql/creation.py

@@ -18 +18 @@
         'FilePathField':     'varchar(%(max_length)s)',
         'FloatField':        'double precision',
         'IntegerField':      'integer',
+        'BigIntegerField':   'bigint',
         'IPAddressField':    'char(15)',
         'NullBooleanField':  'bool',
         'OneToOneField':     'integer',
@@ -63 +64 @@
                 field.rel.to._meta.db_table, field.rel.to._meta.pk.column)
             ]
         return table_output, deferred
-        
- No newline at end of file
+        

django/db/backends/oracle/introspection.py

@@ -29 +29 @@
     def get_field_type(self, data_type, description):
         # If it's a NUMBER with scale == 0, consider it an IntegerField
         if data_type == cx_Oracle.NUMBER and description[5] == 0:
-            return 'IntegerField'
+            if description[4] > 11:
+                return 'BigIntegerField'
+            else:
+                return 'IntegerField'
         else:
             return super(DatabaseIntrospection, self).get_field_type(
                 data_type, description)

django/db/backends/oracle/creation.py

@@ -27 +27 @@
         'FilePathField':                'NVARCHAR2(%(max_length)s)',
         'FloatField':                   'DOUBLE PRECISION',
         'IntegerField':                 'NUMBER(11)',
+        'BigIntegerField':              'NUMBER(19)',
         'IPAddressField':               'VARCHAR2(15)',
         'NullBooleanField':             'NUMBER(1) CHECK ((%(qn_column)s IN (0,1)) OR (%(qn_column)s IS NULL))',
         'OneToOneField':                'NUMBER(11)',

django/contrib/admin/options.py

@@ -42 +42 @@
         'form_class': forms.SplitDateTimeField,
         'widget': widgets.AdminSplitDateTime
     },
-    models.DateField:    {'widget': widgets.AdminDateWidget},
-    models.TimeField:    {'widget': widgets.AdminTimeWidget},
-    models.TextField:    {'widget': widgets.AdminTextareaWidget},
-    models.URLField:     {'widget': widgets.AdminURLFieldWidget},
-    models.IntegerField: {'widget': widgets.AdminIntegerFieldWidget},
-    models.CharField:    {'widget': widgets.AdminTextInputWidget},
-    models.ImageField:   {'widget': widgets.AdminFileWidget},
-    models.FileField:    {'widget': widgets.AdminFileWidget},
+    models.DateField:       {'widget': widgets.AdminDateWidget},
+    models.TimeField:       {'widget': widgets.AdminTimeWidget},
+    models.TextField:       {'widget': widgets.AdminTextareaWidget},
+    models.URLField:        {'widget': widgets.AdminURLFieldWidget},
+    models.IntegerField:    {'widget': widgets.AdminIntegerFieldWidget},
+    models.BigIntegerField: {'widget': widgets.AdminIntegerFieldWidget},
+    models.CharField:       {'widget': widgets.AdminTextInputWidget},
+    models.ImageField:      {'widget': widgets.AdminFileWidget},
+    models.FileField:       {'widget': widgets.AdminFileWidget},
 }
 
 

tests/regressiontests/model_fields/tests.py

@@ -6 +6 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 
-from models import Foo, Bar, Whiz, BigD, BigS, Image
+from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt
 
 try:
     from decimal import Decimal
@@ -144 +144 @@
         bs = BigS.objects.create(s = 'slug'*50)
         bs = BigS.objects.get(pk=bs.pk)
         self.assertEqual(bs.s, 'slug'*50)
+
+class BigIntegerFieldTests(django.test.TestCase):
+    def test_existence(self):
+        self.assertEqual(len(BigInt.objects.all()), 0)
+
+    def test_limits(self):
+        self.assertRaises(ValueError, BigInt(value = 9223372036854775809111111111111111111).save)
+        self.assertRaises(ValueError, BigInt(value = -9223372036854775809111111111111111111).save)
+        self.assertRaises(ValueError, BigInt(value = 9223372036854775808).save)
+        self.assertRaises(ValueError, BigInt(value = -9223372036854775809).save)
+        self.assertEqual(BigInt(value = -9223372036854775808).save(), None)
+        self.assertEqual(BigInt(value = 9223372036854775807).save(), None)
+        self.assertEqual(BigInt(value = 0).save(), None)
+
+    def test_types(self):
+        b = BigInt(value = 0)
+        self.assertTrue(isinstance(b.value, (int, long)))
+        b.save()
+        self.assertTrue(isinstance(b.value, (int, long)))
+        b = BigInt.objects.all()[0]
+        self.assertTrue(isinstance(b.value, (int, long)))
+
+    def test_coercing(self):
+        b = BigInt(value = 10)
+        b.save()
+        self.assertEqual(b.value, 10)
+        self.assertEqual(unicode(b), unicode(10))
+
+    def test_null(self):
+        # this test needs to be run in one transaction, so null tests need to
+        # be split
+        try:
+            # it raises different exceptions depending on backend
+            BigInt(value = None).save()
+            self.assertTrue(False, 'null saved in not null field')
+        except:
+            pass
+
+    def test_null2(self):
+        BigInt(value = 1, null_value = 4).save()
+        BigInt(value = 1, null_value = None).save()

tests/regressiontests/model_fields/models.py

@@ -51 +51 @@
 class BigS(models.Model):
     s = models.SlugField(max_length=255)
 
+class BigInt(models.Model):
+    value = models.BigIntegerField()
+    null_value = models.BigIntegerField(null = True, blank = True)
 
+    def __unicode__(self):
+        return unicode(self.value)
+
 ###############################################################################
 # ImageField
 

tests/regressiontests/introspection/tests.py

@@ -77 +77 @@
         cursor = connection.cursor()
         desc = connection.introspection.get_table_description(cursor, Reporter._meta.db_table)
         self.assertEqual([datatype(r[1], r) for r in desc],
-                          ['IntegerField', 'CharField', 'CharField', 'CharField'])
+                          ['IntegerField', 'CharField', 'CharField', 'CharField', 'BigIntegerField'])
 
     # Regression test for #9991 - 'real' types in postgres
     if settings.DATABASE_ENGINE.startswith('postgresql'):

tests/regressiontests/introspection/models.py

@@ -4 +4 @@
     first_name = models.CharField(max_length=30)
     last_name = models.CharField(max_length=30)
     email = models.EmailField()
+    facebook_user_id = models.BigIntegerField()
 
     def __unicode__(self):
         return u"%s %s" % (self.first_name, self.last_name)
@@ -17 +18 @@
         return self.headline
 
     class Meta:
-        ordering = ('headline',)
- No newline at end of file
+        ordering = ('headline',)

docs/ref/models/fields.txt

@@ -641 +641 @@
 An integer. The admin represents this as an ``<input type="text">`` (a
 single-line input).
 
+``bigintegerfield``
+~~~~~~~~~~~~~~~~
+
+.. class:: BigIntegerField([**options])
+
+A big integer. The admin represents this as an ``<input type="text">``
+(a single-line input).
+
+a 64 bit type like an ``integerfield``, except that it fits numbers from
+-9223372036854775808 to 9223372036854775807
+ 
+
 ``IPAddressField``
 ------------------