Merge branch 'master' of github.com:MongoEngine/mongoengine

2014-06-26 19:25:35 +01:00 · 2014-06-26 19:25:35 +01:00 · 5c295fb9e3
commit 5c295fb9e3
parent 4ee212e7d5 a778a91106
1 changed files with 2 additions and 1 deletions
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@ -359,7 +359,8 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
                    new_class.id = field

        # Set primary key if not defined by the document
-        new_class._auto_id_field = False
+        new_class._auto_id_field = getattr(parent_doc_cls,
+                                           '_auto_id_field', False)
        if not new_class._meta.get('id_field'):
            new_class._auto_id_field = True
            new_class._meta['id_field'] = 'id'