Tweaked SequenceField so that it doesn't increment on creation.

[refs #238]

tests/fields.py

@@ -1379,20 +1379,7 @@ class FieldTest(unittest.TestCase):
         self.assertEqual(d2.data, {})
         self.assertEqual(d2.data2, {})
 
-
     def test_sequence_field(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True)
-
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
-        p = Person()
-        p.save()
-
-        p = Person.objects.first()
-        self.assertEqual(p.id, 1)
-
-    def test_multiple_sequence_field(self):
         class Person(Document):
             id = SequenceField(primary_key=True)
             name = StringField()
@@ -1404,18 +1391,76 @@ class FieldTest(unittest.TestCase):
             p = Person(name="Person %s" % x)
             p.save()
 
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
         ids = [i.id for i in Person.objects]
         self.assertEqual(ids, range(1, 11))
 
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+    def test_multiple_sequence_fields(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            counter = SequenceField()
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
         for x in xrange(10):
             p = Person(name="Person %s" % x)
             p.save()
 
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 21))
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
+
+        counters = [i.counter for i in Person.objects]
+        self.assertEqual(counters, range(1, 11))
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+    def test_multiple_sequence_fields_on_docs(self):
+
+        class Animal(Document):
+            id = SequenceField(primary_key=True)
+
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+
+        self.db['mongoengine.counters'].drop()
+        Animal.drop_collection()
+        Person.drop_collection()
+
+        for x in xrange(10):
+            a = Animal(name="Animal %s" % x)
+            a.save()
+            p = Person(name="Person %s" % x)
+            p.save()
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
+        self.assertEqual(c['next'], 10)
+
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
+
+        id = [i.id for i in Animal.objects]
+        self.assertEqual(id, range(1, 11))
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
+        self.assertEqual(c['next'], 10)
 
-        counter = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(counter['next'], 20)
 
 if __name__ == '__main__':
     unittest.main()