natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Benedict Elliott Smith 2014-06-23 16:57:01 +01:00
parent 944c1716d6 c33e77ae77
commit cdf08084d4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/cqlsh
View File

@ -532,6 +532,10 @@ class Shell(cmd.Cmd):
self.empty_lines = 0
self.statement_error = False
self.single_statement = single_statement
#see CASSANDRA-7399
type_for_composites = lambda cls: "'%s'" % cls.cass_parameterized_type_with(cls.subtypes, True)
cassandra.cqltypes.CompositeType.cql_parameterized_type = classmethod(type_for_composites)
cassandra.cqltypes.DynamicCompositeType.cql_parameterized_type = classmethod(type_for_composites)
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)