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

fix for UnboundLocalError when use the composite index with primary key field

Browse Source
This commit is contained in:
Anton Kolechkin 2012-08-23 11:58:04 +07:00
parent 0e3c34e1da
commit 4bc5082681
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mongoengine/queryset.py
View File

@ -501,7 +501,9 @@ class QuerySet(object):
direction = None direction = None
allow_inheritance = doc_cls._meta.get('allow_inheritance') != False allow_inheritance = doc_cls._meta.get('allow_inheritance') != False
use_types = allow_inheritance
# If sparse - dont include types
use_types = allow_inheritance and not spec.get('sparse', False)
for key in spec['fields']: for key in spec['fields']:
# Get ASCENDING direction from +, DESCENDING from -, and GEO2D from * # Get ASCENDING direction from +, DESCENDING from -, and GEO2D from *
@ -518,6 +520,7 @@ class QuerySet(object):
parts = key.split('.') parts = key.split('.')
if parts in (['pk'], ['id'], ['_id']): if parts in (['pk'], ['id'], ['_id']):
key = '_id' key = '_id'
fields = []
else: else:
fields = QuerySet._lookup_field(doc_cls, parts) fields = QuerySet._lookup_field(doc_cls, parts)
parts = [field if field == '_id' else field.db_field parts = [field if field == '_id' else field.db_field
@ -525,10 +528,6 @@ class QuerySet(object):
key = '.'.join(parts) key = '.'.join(parts)
index_list.append((key, direction)) index_list.append((key, direction))
# If sparse - dont include types
if spec.get('sparse', False):
use_types = False
# Check if a list field is being used, don't use _types if it is # Check if a list field is being used, don't use _types if it is
if use_types and not all(f._index_with_types for f in fields): if use_types and not all(f._index_with_types for f in fields):
use_types = False use_types = False
@ -536,7 +535,7 @@ class QuerySet(object):
# If _types is being used, prepend it to every specified index # If _types is being used, prepend it to every specified index
index_types = doc_cls._meta.get('index_types', True) index_types = doc_cls._meta.get('index_types', True)
if (spec.get('types', index_types) and allow_inheritance and use_types if (spec.get('types', index_types) and use_types
and direction is not pymongo.GEO2D): and direction is not pymongo.GEO2D):
index_list.insert(0, ('_types', 1)) index_list.insert(0, ('_types', 1))