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

Merge branch 'feature-saferfilter' of https://github.com/elasticsales/mongoengine into 0.8

Browse Source
This commit is contained in:
Ross Lawley 2012-12-19 11:47:46 +00:00
commit accdd82970
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mongoengine/queryset/queryset.py
View File

@ -117,6 +117,9 @@ class QuerySet(object):
""" """
query = Q(**query) query = Q(**query)
if q_obj: if q_obj:
# make sure proper query object is passed
if not isinstance(q_obj, QNode):
raise InvalidQueryError('Not a query object: %s. Did you intend to use key=value?' % q_obj)
query &= q_obj query &= q_obj
self._query_obj &= query self._query_obj &= query
self._mongo_query = None self._mongo_query = None

8
tests/test_queryset.py
View File

@ -1375,6 +1375,14 @@ class QuerySetTest(unittest.TestCase):
self.assertEqual(len(self.Person.objects(Q(age__in=[20]))), 2) self.assertEqual(len(self.Person.objects(Q(age__in=[20]))), 2)
self.assertEqual(len(self.Person.objects(Q(age__in=[20, 30]))), 3) self.assertEqual(len(self.Person.objects(Q(age__in=[20, 30]))), 3)
# Test invalid query objs
def wrong_query_objs():
self.Person.objects('user1')
def wrong_query_objs_filter():
self.Person.objects('user1')
self.assertRaises(InvalidQueryError, wrong_query_objs)
self.assertRaises(InvalidQueryError, wrong_query_objs_filter)
def test_q_regex(self): def test_q_regex(self):
"""Ensure that Q objects can be queried using regexes. """Ensure that Q objects can be queried using regexes.
""" """