Merge branch 'master' into master

beltran · web-flow · commit 82c49cd909d2 · 2017-11-29T13:25:02.000-05:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,10 +1,15 @@
 3.13.0
 ======
 
+Features
+--------
+* cqlengine: LIKE filter operator (PYTHON-512)
+
 Bug Fixes
 ---------
 * Support retry_policy in PreparedStatement (PYTHON-861)
 
+
 3.12.0
 ======
 November 6, 2017
diff --git a/cassandra/cqlengine/operators.py b/cassandra/cqlengine/operators.py
@@ -93,3 +93,8 @@ class LessThanOrEqualOperator(BaseWhereOperator):
 class ContainsOperator(EqualsOperator):
     symbol = "CONTAINS"
     cql_symbol = 'CONTAINS'
+
+
+class LikeOperator(EqualsOperator):
+    symbol = "LIKE"
+    cql_symbol = 'LIKE'
diff --git a/docs/cqlengine/queryset.rst b/docs/cqlengine/queryset.rst
@@ -191,6 +191,21 @@ Filtering Operators
 
         Note that we need to use allow_filtering() since the *options* column has no secondary index.
 
+    :attr:`LIKE (__like) <query.QueryOperator.LikeOperator>`
+
+        The LIKE operator is available for text columns that have a SASI secondary index.
+
+        .. code-block:: python
+
+            q = Automobile.objects.filter(model__like='%Civic%').allow_filtering()
+
+        Limitations:
+        - Currently, cqlengine does not support SASI index creation. To use this feature,
+          you need to create the SASI index using the core driver.
+        - Queries using LIKE must use allow_filtering() since the *model* column has no
+          standard secondary index. Note that the server will use the SASI index properly
+          when executing the query.
+
 TimeUUID Functions
 ==================
 
diff --git a/tests/integration/cqlengine/operators/test_where_operators.py b/tests/integration/cqlengine/operators/test_where_operators.py
@@ -35,6 +35,7 @@ def check_lookup(symbol, expected):
         check_lookup('LT', LessThanOperator)
         check_lookup('LTE', LessThanOrEqualOperator)
         check_lookup('CONTAINS', ContainsOperator)
+        check_lookup('LIKE', LikeOperator)
 
     def test_operator_rendering(self):
         """ tests symbols are rendered properly """
@@ -46,5 +47,6 @@ def test_operator_rendering(self):
         self.assertEqual("<", six.text_type(LessThanOperator()))
         self.assertEqual("<=", six.text_type(LessThanOrEqualOperator()))
         self.assertEqual("CONTAINS", six.text_type(ContainsOperator()))
+        self.assertEqual("LIKE", six.text_type(LikeOperator()))
 
 
