Only dereference fields than need it

Fixes MongoEngine/mongoengine#31
2012-07-11 15:23:27 +01:00
parent 4f5aa8c43b
commit 34d08ce8ef
1 changed files with 4 additions and 2 deletions
--- a/mongoengine/base.py
+++ b/mongoengine/base.py
@@ -267,8 +267,10 @@ class ComplexBaseField(BaseField):
        if instance is None:
            # Document class being used rather than a document object
            return self
-
-        if not self._dereference and instance._initialised:
+        from fields import GenericReferenceField, ReferenceField
+        dereference = self.field is None or isinstance(self.field,
+            (GenericReferenceField, ReferenceField))
+        if not self._dereference and instance._initialised and dereference:
            from dereference import DeReference
            self._dereference = DeReference()  # Cached
            instance._data[self.name] = self._dereference(