pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wrong _delta results on nested MapFields #931

Browse Source
This commit is contained in:
elephant 2015-04-06 20:21:36 +05:00 committed by Eremeev Danil
parent 3f14958741
commit 7726be94be
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mongoengine/dereference.py
View File

@ -220,7 +220,8 @@ class DeReference(object):
elif isinstance(v, (dict, SON)) and '_ref' in v: elif isinstance(v, (dict, SON)) and '_ref' in v:
data[k]._data[field_name] = self.object_map.get(v['_ref'].id, v) data[k]._data[field_name] = self.object_map.get(v['_ref'].id, v)
elif isinstance(v, dict) and depth <= self.max_depth: elif isinstance(v, dict) and depth <= self.max_depth:
data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name) item_name = "%s.%s.%s" % (name, k, field_name)
data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
elif isinstance(v, (list, tuple)) and depth <= self.max_depth: elif isinstance(v, (list, tuple)) and depth <= self.max_depth:
data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name) data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name)
elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth: elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:

24
tests/document/delta.py
View File

@ -827,5 +827,29 @@ class DeltaTest(unittest.TestCase):
org2.reload() org2.reload()
self.assertEqual(org2.name, 'New Org 2') self.assertEqual(org2.name, 'New Org 2')
def test_delta_for_nested_map_fields(self):
class EmbeddedRole(EmbeddedDocument):
type = StringField()
class EmbeddedUser(EmbeddedDocument):
name = StringField()
roles = MapField(field=EmbeddedDocumentField(EmbeddedRole))
class Doc(Document):
users = MapField(field=EmbeddedDocumentField(EmbeddedUser))
num = IntField(default=-1)
Doc.drop_collection()
doc = Doc(num=1)
doc.users["007"] = EmbeddedUser(name="Agent007")
doc.save()
d = Doc.objects(num=1).first()
d.users["007"]["roles"]["666"] = EmbeddedRole(type="superadmin")
delta = d._delta()
self.assertEqual(True, "users.007.roles.666" in delta[0])
self.assertEqual('superadmin', delta[0]["users.007.roles.666"]["type"])
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()