Fix some tests

aboudreault · aboudreault · commit 625e7900c58e · 2018-04-04T08:37:09.000-04:00
diff --git a/cassandra/cqlengine/query.py b/cassandra/cqlengine/query.py
@@ -1076,8 +1076,9 @@ def _validate_select_where(self):
         # custom indexes to be queried with any operator (a difference
         # between a secondary index)
         equal_ops = [self.model._get_column_by_db_name(w.field) \
-                     for w in self._where if (isinstance(w.operator, EqualsOperator) and not isinstance(w.value, Token))
-                     or self.model._get_column_by_db_name(w.field).custom_index]
+                     for w in self._where if not isinstance(w.value, Token)
+                     and (isinstance(w.operator, EqualsOperator)
+                          or self.model._get_column_by_db_name(w.field).custom_index)]
         token_comparison = any([w for w in self._where if isinstance(w.value, Token)])
         if not any(w.primary_key or w.has_index for w in equal_ops) and not token_comparison and not self._allow_filtering:
             raise QueryException(
diff --git a/tests/integration/cqlengine/test_connections.py b/tests/integration/cqlengine/test_connections.py
@@ -536,6 +536,7 @@ def setUpClass(cls):
         conn.register_connection('cluster', [CASSANDRA_IP])
         test_queryset.TestModel.__queryset__ = ModelQuerySetNew
         test_queryset.IndexedTestModel.__queryset__ = ModelQuerySetNew
+        test_queryset.CustomIndexedTestModel.__queryset__ = ModelQuerySetNew
         test_queryset.IndexedCollectionsTestModel.__queryset__ = ModelQuerySetNew
         test_queryset.TestMultiClusteringModel.__queryset__ = ModelQuerySetNew
 
