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

'set__comments__0__body="asdf"' syntax works

Browse Source
This commit is contained in:
Alistair Roche 2011-05-23 18:27:01 +01:00
parent 95c2643f63
commit 36034ee15f
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mongoengine/base.py
View File

@ -190,7 +190,6 @@ class DocumentMetaclass(type):
attrs['_class_name'] = '.'.join(reversed(class_name)) attrs['_class_name'] = '.'.join(reversed(class_name))
attrs['_superclasses'] = superclasses attrs['_superclasses'] = superclasses
# Add the document's fields to the _fields attribute # Add the document's fields to the _fields attribute
for attr_name, attr_value in attrs.items(): for attr_name, attr_value in attrs.items():
if hasattr(attr_value, "__class__") and \ if hasattr(attr_value, "__class__") and \

15
mongoengine/queryset.py
View File

@ -523,6 +523,10 @@ class QuerySet(object):
fields = [] fields = []
field = None field = None
for field_name in parts: for field_name in parts:
if field_name.isdigit():
fields.append(field_name)
field = field.field
continue
if field is None: if field is None:
# Look up first field from the document # Look up first field from the document
if field_name == 'pk': if field_name == 'pk':
@ -620,7 +624,6 @@ class QuerySet(object):
mongo_query[key] = value mongo_query[key] = value
elif key in mongo_query and isinstance(mongo_query[key], dict): elif key in mongo_query and isinstance(mongo_query[key], dict):
mongo_query[key].update(value) mongo_query[key].update(value)
return mongo_query return mongo_query
def get(self, *q_objs, **query): def get(self, *q_objs, **query):
@ -1010,7 +1013,6 @@ class QuerySet(object):
""" """
operators = ['set', 'unset', 'inc', 'dec', 'pop', 'push', 'push_all', operators = ['set', 'unset', 'inc', 'dec', 'pop', 'push', 'push_all',
'pull', 'pull_all', 'add_to_set'] 'pull', 'pull_all', 'add_to_set']
mongo_update = {} mongo_update = {}
for key, value in update.items(): for key, value in update.items():
parts = key.split('__') parts = key.split('__')
@ -1033,10 +1035,15 @@ class QuerySet(object):
if _doc_cls: if _doc_cls:
# Switch field names to proper names [set in Field(name='foo')] # Switch field names to proper names [set in Field(name='foo')]
fields = QuerySet._lookup_field(_doc_cls, parts) fields = QuerySet._lookup_field(_doc_cls, parts)
parts = [field.db_field for field in fields] parts = []
for field in fields:
if isinstance(field, str):
parts.append(field)
else:
parts.append(field.db_field)
# Convert value to proper value # Convert value to proper value
field = fields[-1] field = fields[-1]
if op in (None, 'set', 'push', 'pull', 'addToSet'): if op in (None, 'set', 'push', 'pull', 'addToSet'):
value = field.prepare_query_value(op, value) value = field.prepare_query_value(op, value)
elif op in ('pushAll', 'pullAll'): elif op in ('pushAll', 'pullAll'):