Ticket #12030: positive_integer.diff

django/db/models/fields/__init__.py

@@ -978 +978 @@
 
 class PositiveIntegerField(IntegerField):
     description = _("Integer")
+    MAX_POSINT = 4294967295
 
     def get_internal_type(self):
         return "PositiveIntegerField"
 
     def formfield(self, **kwargs):
-        defaults = {'min_value': 0}
+        defaults = {'min_value': 0,
+                    'max_value': PositiveIntegerField.MAX_POSINT}
         defaults.update(kwargs)
         return super(PositiveIntegerField, self).formfield(**defaults)
 

tests/regressiontests/model_fields/tests.py

@@ -8 +8 @@
 from django.db.models.fields.files import FieldFile
 from django.utils import unittest
 
-from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel, Document
+from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, PosInt, Post, NullBooleanModel, BooleanModel, Document
 
 # If PIL available, do these tests.
 if Image:
@@ -299 +299 @@
         b = BigInt.objects.get(value = '10')
         self.assertEqual(b.value, 10)
 
+
+class PositiveIntegerFieldTests(test.TestCase):
+    def test_limits(self):
+        # Ensure that values that are right at the limits can be saved
+        # and then retrieved whitout corruption.
+        maxval = 4294967295
+        minval = 0
+        PosInt.objects.create(value=maxval)
+        qs = PosInt.objects.filter(value__gte=maxval)
+        self.assertEqual(qs.count(), 1)
+        self.assertEqual(qs[0].value, maxval)
+        PosInt.objects.create(value=minval)
+        qs = PosInt.objects.filter(value__lte=minval)
+        self.assertEqual(qs.count(), 1)
+        self.assertEqual(qs[0].value, minval)
+    def test_types(self):
+        p = PosInt(value=0)
+        self.assertTrue(isinstance(p.value, (int, long)))
+        p.save()
+        self.assertTrue(isinstance(p.value, (int, long)))
+        p = PosInt.objects.all()[0]
+        self.assertTrue(isinstance(p.value, (int, long)))
+
+    def test_coercing(self):
+        PosInt.objects.create(value='10')
+        p = PosInt.objects.get(value = '10')
+        self.assertEqual(p.value, 10)
+
+
 class TypeCoercionTests(test.TestCase):
     """
     Test that database lookups can accept the wrong types and convert

tests/regressiontests/model_fields/models.py

@@ -55 +55 @@
     value = models.BigIntegerField()
     null_value = models.BigIntegerField(null = True, blank = True)
 
+class PosInt(models.Model):
+    value = models.PositiveIntegerField()
+    null_value = models.PositiveIntegerField(null = True, blank = True)
+
 class Post(models.Model):
     title = models.CharField(max_length=100)
     body = models.TextField()

AUTHORS

@@ -421 +421 @@
     Manuel Saelices <msaelices@yaco.es>
     Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
     Vinay Sajip <vinay_sajip@yahoo.co.uk>
+    Bartolomé Sánchez <aliaselbarto@gmail.com>
     Kadesarin Sanjek
     Massimo Scamarcia <massimo.scamarcia@gmail.com>
     Paulo Scardine <paulo@scardine.com.br>