Skip to content

EmbeddedDoc. prepare_query_value for None value #1163

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

Closed
wants to merge 4 commits into from
Closed

EmbeddedDoc. prepare_query_value for None value #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94ae4ad
EmbeddedDoc. prepare_query_value for None value
decklord Nov 18, 2015
91c0d71
fix If value._instance is not defined, crashing
decklord Nov 18, 2015
de320ed
filter for empty lists on embedded fields, crash.
decklord Nov 18, 2015
cf75dac
Hotfix on mongoengine making field not update correctly when updating…
decklord Aug 23, 2016
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
2 changes: 1 addition & 1 deletion mongoengine/base/datastructures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def __getitem__(self, key, *args, **kwargs):
value = super(BaseList, self).__getitem__(key)

EmbeddedDocument = _import_class('EmbeddedDocument')
if isinstance(value, EmbeddedDocument) and value._instance is None:
if isinstance(value, EmbeddedDocument) and getattr(value, '_instance', None) is None:
value._instance = self._instance
elif not isinstance(value, BaseDict) and isinstance(value, dict):
value = BaseDict(value, None, '%s.%s' % (self._name, key))
Expand Down
2 changes: 1 addition & 1 deletion mongoengine/base/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ def _mark_as_changed(self, key):
# remove lower level changed fields
level = '.'.join(levels[:idx]) + '.'
remove = self._changed_fields.remove
for field in self._changed_fields:
for field in copy.copy(self._changed_fields):
if field.startswith(level):
remove(field)

Expand Down
7 changes: 7 additions & 0 deletions mongoengine/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,13 @@ def lookup_member(self, member_name):
return self.document_type._fields.get(member_name)

def prepare_query_value(self, op, value):

if value is None:
return value

if isinstance(value, list) and len(value) == 0:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't these two if statements be merged?

return value

if not isinstance(value, self.document_type):
value = self.document_type._from_son(value)
super(EmbeddedDocumentField, self).prepare_query_value(op, value)
Expand Down