Merge branch 'master' of https://github.com/idoshr/mongoengine into Update_with_Aggregation_Pipeline

Author: idocyabra

AUTHORS

@@ -262,3 +262,4 @@ that much better:
  * Jan Stein (https://github.com/janste63)
  * Timothé Perez (https://github.com/AchilleAsh)
  * oleksandr-l5 (https://github.com/oleksandr-l5)
+ * Ido Shraga (https://github.com/idoshr)

docs/changelog.rst

@@ -10,6 +10,7 @@ Development
 - EnumField improvements: now `choices` limits the values of an enum to allow
 - Fix deepcopy of EmbeddedDocument #2202
 - Fix error when using precision=0 with DecimalField #2535
+- Add support for regex and whole word text search query #2568
 
 Changes in 0.23.1
 ===========

docs/guide/defining-documents.rst

@@ -477,7 +477,7 @@ dictionary containing a full index definition.
 
 A direction may be specified on fields by prefixing the field name with a
 **+** (for ascending) or a **-** sign (for descending). Note that direction
-only matters on multi-field indexes. Text indexes may be specified by prefixing
+only matters on compound indexes. Text indexes may be specified by prefixing
 the field name with a **$**. Hashed indexes may be specified by prefixing
 the field name with a **#**::
 
@@ -488,14 +488,14 @@ the field name with a **#**::
         created = DateTimeField()
         meta = {
             'indexes': [
-                'title',
+                'title',   # single-field index
                 '$title',  # text index
                 '#title',  # hashed index
-                ('title', '-rating'),
-                ('category', '_cls'),
+                ('title', '-rating'),  # compound index
+                ('category', '_cls'),  # compound index
                 {
                     'fields': ['created'],
-                    'expireAfterSeconds': 3600
+                    'expireAfterSeconds': 3600  # ttl index
                 }
             ]
         }

mongoengine/fields.py

@@ -162,10 +162,10 @@ def prepare_query_value(self, op, value):
             elif op == "regex":
                 regex = value
 
-            # escape unsafe characters which could lead to a re.error
             if op == "regex":
                 value = re.compile(regex, flags)
             else:
+                # escape unsafe characters which could lead to a re.error
                 value = re.escape(value)
                 value = re.compile(regex % value, flags)
         return super().prepare_query_value(op, value)

mongoengine/queryset/base.py

@@ -727,7 +727,7 @@ def with_id(self, object_id):
         return queryset.filter(pk=object_id).first()
 
     def in_bulk(self, object_ids):
-        """ "Retrieve a set of documents by their ids.
+        """Retrieve a set of documents by their ids.
 
         :param object_ids: a list or tuple of ObjectId's
         :rtype: dict of ObjectId's as keys and collection-specific