use as_text_type kwarg for conversion

Author: mambocab

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,10 +1435,8 @@ def as_cql_query(self):
                 index_target,
                 class_name)
             if options:
-                opts_cql_encoded = _encoder.cql_encode_all_types(options)
-                # PYTHON-1008
-                if isinstance(opts_cql_encoded, six.binary_type):
-                    opts_cql_encoded = opts_cql_encoded.decode('utf-8')
+                # 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