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

Merge branch 'master' of http://github.com/sibsibsib/mongoengine into v0.4

Browse Source 
Conflicts:
	mongoengine/queryset.py
	tests/queryset.py
This commit is contained in:
Harry Marr 2010-10-03 01:57:22 +01:00
commit 4c68bc6c96
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mongoengine/queryset.py
View File

@ -721,7 +721,7 @@ class QuerySet(object):
"""Transform an update spec from Django-style format to Mongo format. """Transform an update spec from Django-style format to Mongo format.
""" """
operators = ['set', 'unset', 'inc', 'dec', 'pop', 'push', 'push_all', operators = ['set', 'unset', 'inc', 'dec', 'pop', 'push', 'push_all',
'pull', 'pull_all'] 'pull', 'pull_all', 'add_to_set']
mongo_update = {} mongo_update = {}
for key, value in update.items(): for key, value in update.items():
@ -739,6 +739,8 @@ class QuerySet(object):
op = 'inc' op = 'inc'
if value > 0: if value > 0:
value = -value value = -value
elif op == 'add_to_set':
op = op.replace('_to_set', 'ToSet')
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')]
@ -747,7 +749,8 @@ class QuerySet(object):
# Convert value to proper value # Convert value to proper value
field = fields[-1] field = fields[-1]
if op in (None, 'set', 'unset', 'pop', 'push', 'pull'): if op in (None, 'set', 'unset', 'pop', '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'):
value = [field.prepare_query_value(op, v) for v in value] value = [field.prepare_query_value(op, v) for v in value]

5
tests/queryset.py
View File

@ -717,6 +717,11 @@ class QuerySetTest(unittest.TestCase):
post.reload() post.reload()
self.assertEqual(post.tags, tags) self.assertEqual(post.tags, tags)
BlogPost.objects.update_one(add_to_set__tags='unique')
BlogPost.objects.update_one(add_to_set__tags='unique')
post.reload()
self.assertEqual(post.tags.count('unique'), 1)
BlogPost.drop_collection() BlogPost.drop_collection()
def test_update_pull(self): def test_update_pull(self):