Skip to content

Dereferencing abstract documents correctly from reference fields and from_son #1801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmoonport wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Dereferencing abstract documents correctly from reference fields and from_son #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7b9256
Added DBRef cls checks for abstract document dereferencing
Jun 7, 2018
24fabc2
fixed code format issues
Jun 7, 2018
4adc8f2
fixed code format issues
Jun 7, 2018
d5bd147
updates to dereference to fix abstract document dereference
Sep 1, 2018
de02cfe
fixes for abstract document dereferencing
Sep 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions mongoengine/dereference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,28 @@ def _find_references(self, items, depth=0):
# LazyReference inherits DBRef but should not be dereferenced here !
continue
elif isinstance(v, DBRef):
reference_map.setdefault(field.document_type, set()).add(v.id)
if hasattr(v, 'cls'):
reference_map.setdefault(get_document(v.cls), set()).add(v.id)
else:
reference_map.setdefault(field.document_type, set()).add(v.id)
elif isinstance(v, (dict, SON)) and '_ref' in v:
reference_map.setdefault(get_document(v['_cls']), set()).add(v['_ref'].id)
elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
field_cls = getattr(getattr(field, 'field', None), 'document_type', None)
references = self._find_references(v, depth)
for key, refs in references.iteritems():
if isinstance(field_cls, (Document, TopLevelDocumentMetaclass)):
key = field_cls
if not field_cls._meta.get('abstract', False):
key = field_cls
reference_map.setdefault(key, set()).update(refs)
elif isinstance(item, LazyReference):
# LazyReference inherits DBRef but should not be dereferenced here !
continue
elif isinstance(item, DBRef):
reference_map.setdefault(item.collection, set()).add(item.id)
if hasattr(item, 'cls'):
reference_map.setdefault(get_document(item.cls), set()).add(item.id)
else:
reference_map.setdefault(item.collection, set()).add(item.id)
elif isinstance(item, (dict, SON)) and '_ref' in item:
reference_map.setdefault(get_document(item['_cls']), set()).add(item['_ref'].id)
elif isinstance(item, (dict, list, tuple)) and depth - 1 <= self.max_depth:
Expand Down
11 changes: 9 additions & 2 deletions mongoengine/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2257,7 +2257,11 @@ def build_lazyref(self, value):
if isinstance(value, self.document_type):
value = LazyReference(self.document_type, value.pk, passthrough=self.passthrough)
elif isinstance(value, DBRef):
value = LazyReference(self.document_type, value.id, passthrough=self.passthrough)
# Honor cls field on DBRef for Abstract Documents
if hasattr(value, 'cls'):
value = LazyReference(get_document(value.cls), value.id, passthrough=self.passthrough)
else:
LazyReference(self.document_type, value.id, passthrough=self.passthrough)
else:
# value is the primary key of the referenced document
value = LazyReference(self.document_type, value, passthrough=self.passthrough)
Expand Down Expand Up @@ -2302,7 +2306,10 @@ def validate(self, value):
pk = value.pk
elif isinstance(value, DBRef):
# TODO: check collection ?
collection = self.document_type._get_collection_name()
if hasattr(value, 'cls'):
collection = get_document(value.cls)._get_collection_name()
else:
collection = self.document_type._get_collection_name()
if value.collection != collection:
self.error("DBRef on bad collection (must be on `%s`)" % collection)
pk = value.id
Expand Down