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

This commit is contained in:
Ross Lawley
2012-12-19 11:47:46 +00:00
2 changed files with 11 additions and 0 deletions

View File

@@ -117,6 +117,9 @@ class QuerySet(object):
"""
query = Q(**query)
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
self._query_obj &= query
self._mongo_query = None