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

Merge pull request #1784 from werat/fix_override_comment

Browse Source 
Restore comment from cached value after queryset copy
This commit is contained in:
erdenezul
2018-05-19 09:23:58 +08:00
committed by GitHub
parent a45942a966 5a6d4387ea
commit bb22287336
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mongoengine/queryset/base.py
View File

@@ -1579,6 +1579,9 @@ class BaseQuerySet(object):
if self._batch_size is not None: if self._batch_size is not None:
self._cursor_obj.batch_size(self._batch_size) self._cursor_obj.batch_size(self._batch_size)
if self._comment is not None:
self._cursor_obj.comment(self._comment)
return self._cursor_obj return self._cursor_obj
def __deepcopy__(self, memo): def __deepcopy__(self, memo):

15
tests/queryset/queryset.py
View File

@@ -2383,14 +2383,19 @@ class QuerySetTest(unittest.TestCase):
age = IntField() age = IntField()
with db_ops_tracker() as q: with db_ops_tracker() as q:
adult = (User.objects.filter(age__gte=18) adult1 = (User.objects.filter(age__gte=18)
.comment('looking for an adult') .comment('looking for an adult')
.first()) .first())
adult2 = (User.objects.comment('looking for an adult')
.filter(age__gte=18)
.first())
ops = q.get_ops() ops = q.get_ops()
self.assertEqual(len(ops), 1) self.assertEqual(len(ops), 2)
op = ops[0] for op in ops:
self.assertEqual(op['query']['$query'], {'age': {'$gte': 18}}) self.assertEqual(op['query']['$query'], {'age': {'$gte': 18}})
self.assertEqual(op['query']['$comment'], 'looking for an adult') self.assertEqual(op['query']['$comment'], 'looking for an adult')
def test_map_reduce(self): def test_map_reduce(self):
"""Ensure map/reduce is both mapping and reducing. """Ensure map/reduce is both mapping and reducing.