Merge f77f45b into 103a287

MongoEngine · Apr 9, 2015 · 6762a4d · 6762a4d
2 parents 103a287 + f77f45b
commit 6762a4d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -219,3 +219,4 @@ that much better:
  * Jimmy Shen (https://github.com/jimmyshen)
  * J. Fernando Sánchez (https://github.com/balkian)
  * Michael Chase (https://github.com/rxsegrxup)
+ * Eremeev Danil (https://github.com/elephanter)
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -85,6 +85,7 @@ Changes in 0.9.0
 - Fixed a few instances where reverse_delete_rule was written as reverse_delete_rules. #791
 - Make `in_bulk()` respect `no_dereference()` #775
 - Handle None from model __str__; Fixes #753 #754
+- _get_changed_fields fix for embedded documents with id field. #925
 
 Changes in 0.8.7
 ================

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
@@ -308,7 +308,7 @@ def to_mongo(self, use_db_field=True, fields=None):
         """
         if not fields:
             fields = []
-        
+
         data = SON()
         data["_id"] = None
         data['_cls'] = self._class_name
@@ -553,7 +553,6 @@ def _get_changed_fields(self, inspected=None):
             if hasattr(data, 'id'):
                 if data.id in inspected:
                     continue
-                inspected.add(data.id)
             if isinstance(field, ReferenceField):
                 continue
             elif (isinstance(data, (EmbeddedDocument, DynamicEmbeddedDocument))

diff --git a/tests/document/delta.py b/tests/document/delta.py
@@ -93,6 +93,7 @@ def test_delta_recursive(self):
     def delta_recursive(self, DocClass, EmbeddedClass):
 
         class Embedded(EmbeddedClass):
+            id = StringField()
             string_field = StringField()
             int_field = IntField()
             dict_field = DictField()
@@ -114,6 +115,7 @@ class Doc(DocClass):
         self.assertEqual(doc._delta(), ({}, {}))
 
         embedded_1 = Embedded()
+        embedded_1.id = "010101"
         embedded_1.string_field = 'hello'
         embedded_1.int_field = 1
         embedded_1.dict_field = {'hello': 'world'}
@@ -123,6 +125,7 @@ class Doc(DocClass):
         self.assertEqual(doc._get_changed_fields(), ['embedded_field'])
 
         embedded_delta = {
+            'id': "010101",
             'string_field': 'hello',
             'int_field': 1,
             'dict_field': {'hello': 'world'},