Merge branch 'master' of https://github.com/gregbanks/mongoengine

2012-04-25 12:31:11 +01:00 · 2012-04-25 12:31:11 +01:00 · a4a8c94374
commit a4a8c94374
parent 0e93f6c0db 49a66ba81a
2 changed files with 35 additions and 0 deletions
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@ -112,6 +112,10 @@ class DeReference(object):
                    for ref in references:
                        if '_cls' in ref:
                            doc = get_document(ref["_cls"])._from_son(ref)
+                        elif doc_type is None:
+                            doc = get_document(
+                                ''.join(x.capitalize() 
+                                        for x in col.split('_')))._from_son(ref)
                        else:
                            doc = doc_type._from_son(ref)
                        object_map[doc.id] = doc