Merge pull request datastax#984 from datastax/python-1008

PYTHON-1008

Author: mambocab

CHANGELOG.rst

@@ -4,6 +4,7 @@
 Bug Fixes
 ---------
 * Improve and fix socket error-catching code in nonblocking-socket reactors (PYTHON-1024)
+* Non-ASCII characters in schema break CQL string generation (PYTHON-1008)
 
 Other
 -----

cassandra/encoder.py

@@ -224,12 +224,15 @@ def cql_encode_set_collection(self, val):
         """
         return '{%s}' % ', '.join(self.mapping.get(type(v), self.cql_encode_object)(v) for v in val)
 
-    def cql_encode_all_types(self, val):
+    def cql_encode_all_types(self, val, as_text_type=False):
         """
         Converts any type into a CQL string, defaulting to ``cql_encode_object``
         if :attr:`~Encoder.mapping` does not contain an entry for the type.
         """
-        return self.mapping.get(type(val), self.cql_encode_object)(val)
+        encoded = self.mapping.get(type(val), self.cql_encode_object)(val)
+        if as_text_type and not isinstance(encoded, six.text_type):
+            return encoded.decode('utf-8')
+        return encoded
 
     if six.PY3:
         def cql_encode_ipaddress(self, val):

cassandra/metadata.py

@@ -1435,7 +1435,9 @@ def as_cql_query(self):
                 index_target,
                 class_name)
             if options:
-                ret += " WITH OPTIONS = %s" % Encoder().cql_encode_all_types(options)
+                # PYTHON-1008: `ret` will always be a unicode
+                opts_cql_encoded = _encoder.cql_encode_all_types(options, as_text_type=True)
+                ret += " WITH OPTIONS = %s" % opts_cql_encoded
             return ret
 
     def export_as_string(self):

tests/unit/test_metadata.py

@@ -18,6 +18,7 @@
     import unittest  # noqa
 
 from binascii import unhexlify
+import logging
 from mock import Mock
 import os
 import six
@@ -38,6 +39,9 @@
 from cassandra.pool import Host
 
 
+log = logging.getLogger(__name__)
+
+
 class StrategiesTest(unittest.TestCase):
 
     @classmethod
@@ -536,9 +540,12 @@ def test_column_name_multiple_partition(self):
 
     def test_index(self):
         im = IndexMetadata(self.name, self.name, self.name, kind='', index_options={'target': self.name})
-        im.export_as_string()
+        log.debug(im.export_as_string())
         im = IndexMetadata(self.name, self.name, self.name, kind='CUSTOM', index_options={'target': self.name, 'class_name': 'Class'})
-        im.export_as_string()
+        log.debug(im.export_as_string())
+        # PYTHON-1008
+        im = IndexMetadata(self.name, self.name, self.name, kind='CUSTOM', index_options={'target': self.name, 'class_name': 'Class', 'delimiter': self.name})
+        log.debug(im.export_as_string())
 
     def test_function(self):
         fm = Function(self.name, self.name, (u'int', u'int'), (u'x', u'y'), u'int', u'language', self.name, False)