pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1117 from reallistic/master

Browse Source 
Enable ops in queries using elemMatch for EmbeddedDocuments
fixes #1130
This commit is contained in:
David Bordeynik 2015-10-21 08:40:39 +03:00
commit 2f1fae38dd
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.rst
View File

@ -11,6 +11,7 @@ Changes in 0.10.1 - DEV
- Fix Document.reload for DynamicDocument. #1050 - Fix Document.reload for DynamicDocument. #1050
- StrictDict & SemiStrictDict are shadowed at init time. #1105 - StrictDict & SemiStrictDict are shadowed at init time. #1105
- Remove test dependencies (nose and rednose) from install dependencies list. #1079 - Remove test dependencies (nose and rednose) from install dependencies list. #1079
- Recursively build query when using elemMatch operator. #1130
Changes in 0.10.0 Changes in 0.10.0
================= =================

21
mongoengine/queryset/transform.py
View File

@ -26,12 +26,12 @@ MATCH_OPERATORS = (COMPARISON_OPERATORS + GEO_OPERATORS +
STRING_OPERATORS + CUSTOM_OPERATORS) STRING_OPERATORS + CUSTOM_OPERATORS)
def query(_doc_cls=None, **query): def query(_doc_cls=None, **kwargs):
"""Transform a query from Django-style format to Mongo format. """Transform a query from Django-style format to Mongo format.
""" """
mongo_query = {} mongo_query = {}
merge_query = defaultdict(list) merge_query = defaultdict(list)
for key, value in sorted(query.items()): for key, value in sorted(kwargs.items()):
if key == "__raw__": if key == "__raw__":
mongo_query.update(value) mongo_query.update(value)
continue continue
@ -105,13 +105,18 @@ def query(_doc_cls=None, **query):
if op: if op:
if op in GEO_OPERATORS: if op in GEO_OPERATORS:
value = _geo_operator(field, op, value) value = _geo_operator(field, op, value)
elif op in CUSTOM_OPERATORS: elif op in ('match', 'elemMatch'):
if op in ('elem_match', 'match'): ListField = _import_class('ListField')
value = field.prepare_query_value(op, value) EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
value = {"$elemMatch": value} if (isinstance(value, dict) and isinstance(field, ListField) and
isinstance(field.field, EmbeddedDocumentField)):
value = query(field.field.document_type, **value)
else: else:
NotImplementedError("Custom method '%s' has not " value = field.prepare_query_value(op, value)
"been implemented" % op) value = {"$elemMatch": value}
elif op in CUSTOM_OPERATORS:
NotImplementedError("Custom method '%s' has not "
"been implemented" % op)
elif op not in STRING_OPERATORS: elif op not in STRING_OPERATORS:
value = {'$' + op: value} value = {'$' + op: value}

9
tests/queryset/queryset.py
View File

@ -4116,6 +4116,15 @@ class QuerySetTest(unittest.TestCase):
ak = list(Bar.objects(foo__match=Foo(shape="square", color="purple"))) ak = list(Bar.objects(foo__match=Foo(shape="square", color="purple")))
self.assertEqual([b1], ak) self.assertEqual([b1], ak)
ak = list(
Bar.objects(foo__elemMatch={'shape': "square", "color__exists": True}))
self.assertEqual([b1, b2], ak)
ak = list(
Bar.objects(foo__match={'shape': "square", "color__exists": True}))
self.assertEqual([b1, b2], ak)
def test_upsert_includes_cls(self): def test_upsert_includes_cls(self):
"""Upserts should include _cls information for inheritable classes """Upserts should include _cls information for inheritable classes
""" """