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

remove ridiculous try-finally clause from BaseQuerySet.distinct

Browse Source
This commit is contained in:
Stefan Wojcik 2016-12-08 23:44:36 -05:00
parent b99985eaf8
commit 756d8b2ac5
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mongoengine/queryset/base.py
View File

@ -817,14 +817,18 @@ class BaseQuerySet(object):
.. versionchanged:: 0.6 - Improved db_field refrence handling .. versionchanged:: 0.6 - Improved db_field refrence handling
""" """
queryset = self.clone() queryset = self.clone()
try: try:
field = self._fields_to_dbfields([field]).pop() field = self._fields_to_dbfields([field]).pop()
finally: except LookUpError:
pass
distinct = self._dereference(queryset._cursor.distinct(field), 1, distinct = self._dereference(queryset._cursor.distinct(field), 1,
name=field, instance=self._document) name=field, instance=self._document)
doc_field = self._document._fields.get(field.split('.', 1)[0]) doc_field = self._document._fields.get(field.split('.', 1)[0])
instance = False instance = None
# We may need to cast to the correct type eg. ListField(EmbeddedDocumentField) # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
EmbeddedDocumentField = _import_class('EmbeddedDocumentField') EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
ListField = _import_class('ListField') ListField = _import_class('ListField')
@ -832,7 +836,8 @@ class BaseQuerySet(object):
if isinstance(doc_field, ListField): if isinstance(doc_field, ListField):
doc_field = getattr(doc_field, 'field', doc_field) doc_field = getattr(doc_field, 'field', doc_field)
if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)): if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
instance = getattr(doc_field, 'document_type', False) instance = getattr(doc_field, 'document_type', None)
# handle distinct on subdocuments # handle distinct on subdocuments
if '.' in field: if '.' in field:
for field_part in field.split('.')[1:]: for field_part in field.split('.')[1:]:
@ -845,10 +850,12 @@ class BaseQuerySet(object):
if isinstance(doc_field, ListField): if isinstance(doc_field, ListField):
doc_field = getattr(doc_field, 'field', doc_field) doc_field = getattr(doc_field, 'field', doc_field)
if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)): if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
instance = getattr(doc_field, 'document_type', False) instance = getattr(doc_field, 'document_type', None)
if instance and isinstance(doc_field, (EmbeddedDocumentField, if instance and isinstance(doc_field, (EmbeddedDocumentField,
GenericEmbeddedDocumentField)): GenericEmbeddedDocumentField)):
distinct = [instance(**doc) for doc in distinct] distinct = [instance(**doc) for doc in distinct]
return distinct return distinct
def only(self, *fields): def only(self, *fields):