From c509f5902fd9cabbcb8d025251705396b0de663b Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Thu, 21 Jul 2016 11:25:51 -0500 Subject: [PATCH] override cql_parameterized_type for generating DCT CQL PYTHON-579 --- cassandra/cqltypes.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cassandra/cqltypes.py b/cassandra/cqltypes.py index 38a382e1..b6a720e6 100644 --- a/cassandra/cqltypes.py +++ b/cassandra/cqltypes.py @@ -989,12 +989,9 @@ class DynamicCompositeType(_ParameterizedType): typename = "org.apache.cassandra.db.marshal.DynamicCompositeType" @classmethod - def cass_parameterized_type_with(cls, subtypes, full=False, **kwargs): - if not full: # short-circuit for unparsed type - return super(DynamicCompositeType, cls).cass_parameterized_type_with(subtypes) - # DCT is always formatted "full", and will always have subtypes (otherwise it is normalized to CompositeType by the server) - sublist = ', '.join('%s=>%s' % (alias, typ.cass_parameterized_type(full=True)) for alias, typ in zip(cls.fieldnames, subtypes)) - return '%s(%s)' % (cls.typename, sublist) + def cql_parameterized_type(cls): + sublist = ', '.join('%s=>%s' % (alias, typ.cass_parameterized_type(full=True)) for alias, typ in zip(cls.fieldnames, cls.subtypes)) + return "'%s(%s)'" % (cls.typename, sublist) class ColumnToCollectionType(_ParameterizedType):