From 2d6ae1691204b1036ee5b7595721303a8533a103 Mon Sep 17 00:00:00 2001
From: Jaepil Jeong <jaepil@kaist.ac.kr>
Date: Thu, 14 Mar 2013 23:25:22 +0900
Subject: [PATCH 1/4] Added LongField to support 64-bit integer type.

---
 mongoengine/fields.py | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index de484a1d..c40491b6 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -27,7 +27,7 @@ except ImportError:
     Image = None
     ImageOps = None
 
-__all__ = ['StringField', 'IntField', 'FloatField', 'BooleanField',
+__all__ = ['StringField', 'IntField', 'LongField', 'FloatField', 'BooleanField',
            'DateTimeField', 'EmbeddedDocumentField', 'ListField', 'DictField',
            'ObjectIdField', 'ReferenceField', 'ValidationError', 'MapField',
            'DecimalField', 'ComplexDateTimeField', 'URLField', 'DynamicField',
@@ -153,7 +153,7 @@ class EmailField(StringField):
 
 
 class IntField(BaseField):
-    """An integer field.
+    """An 32-bit integer field.
     """
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
@@ -186,6 +186,40 @@ class IntField(BaseField):
         return int(value)
 
 
+class LongField(BaseField):
+    """An 64-bit integer field.
+    """
+
+    def __init__(self, min_value=None, max_value=None, **kwargs):
+        self.min_value, self.max_value = min_value, max_value
+        super(LongField, self).__init__(**kwargs)
+
+    def to_python(self, value):
+        try:
+            value = long(value)
+        except ValueError:
+            pass
+        return value
+
+    def validate(self, value):
+        try:
+            value = long(value)
+        except:
+            self.error('%s could not be converted to long' % value)
+
+        if self.min_value is not None and value < self.min_value:
+            self.error('Long value is too small')
+
+        if self.max_value is not None and value > self.max_value:
+            self.error('Long value is too large')
+
+    def prepare_query_value(self, op, value):
+        if value is None:
+            return value
+
+        return long(value)
+
+
 class FloatField(BaseField):
     """An floating point number field.
     """

From e9464e32db4bcd10b332fb4764b3f9189e096f36 Mon Sep 17 00:00:00 2001
From: Jaepil Jeong <jaepil@kaist.ac.kr>
Date: Thu, 14 Mar 2013 23:59:50 +0900
Subject: [PATCH 2/4] Added test cases for LongField.

---
 tests/test_fields.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/test_fields.py b/tests/test_fields.py
index 28af1b23..3ceff8d9 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -144,6 +144,17 @@ class FieldTest(unittest.TestCase):
         self.assertEqual(1, TestDocument.objects(int_fld__ne=None).count())
         self.assertEqual(1, TestDocument.objects(float_fld__ne=None).count())
 
+    def test_long_ne_operator(self):
+        class TestDocument(Document):
+            long_fld = LongField()
+
+        TestDocument.drop_collection()
+
+        TestDocument(long_fld=None).save()
+        TestDocument(long_fld=1).save()
+
+        self.assertEqual(1, TestDocument.objects(long_fld__ne=None).count())
+
     def test_object_id_validation(self):
         """Ensure that invalid values cannot be assigned to string fields.
         """
@@ -217,6 +228,23 @@ class FieldTest(unittest.TestCase):
         person.age = 'ten'
         self.assertRaises(ValidationError, person.validate)
 
+    def test_long_validation(self):
+        """Ensure that invalid values cannot be assigned to long fields.
+        """
+        class TestDocument(Document):
+            value = LongField(min_value=0, max_value=110)
+
+        doc = TestDocument()
+        doc.value = 50
+        doc.validate()
+
+        doc.value = -1
+        self.assertRaises(ValidationError, doc.validate)
+        doc.age = 120
+        self.assertRaises(ValidationError, doc.validate)
+        doc.age = 'ten'
+        self.assertRaises(ValidationError, doc.validate)
+
     def test_float_validation(self):
         """Ensure that invalid values cannot be assigned to float fields.
         """

From 67182713d96233d3d2feb0f67d39ddaf1789c692 Mon Sep 17 00:00:00 2001
From: Jaepil Jeong <jaepil@kaist.ac.kr>
Date: Fri, 15 Mar 2013 00:12:48 +0900
Subject: [PATCH 3/4] Fixed potential overflow error.

---
 mongoengine/fields.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c40491b6..d7c7cf1f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -213,6 +213,9 @@ class LongField(BaseField):
         if self.max_value is not None and value > self.max_value:
             self.error('Long value is too large')
 
+        if value > 0x7FFFFFFFFFFFFFFF:
+            self.error('Long value is too large')
+
     def prepare_query_value(self, op, value):
         if value is None:
             return value

From a762a10decef552ccf6fbee413819d18bede05ea Mon Sep 17 00:00:00 2001
From: Jaepil Jeong <jaepil@kaist.ac.kr>
Date: Mon, 18 Mar 2013 19:30:04 +0900
Subject: [PATCH 4/4] Revert "Fixed potential overflow error."

This reverts commit 67182713d96233d3d2feb0f67d39ddaf1789c692.
---
 mongoengine/fields.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index d7c7cf1f..c40491b6 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -213,9 +213,6 @@ class LongField(BaseField):
         if self.max_value is not None and value > self.max_value:
             self.error('Long value is too large')
 
-        if value > 0x7FFFFFFFFFFFFFFF:
-            self.error('Long value is too large')
-
     def prepare_query_value(self, op, value):
         if value is None:
             return value