Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a175f70fa -> 1e6493083
Fix cqlsh DESC with CompositeType explanation patch by mstepura; reviewed by thobbs for CASSANDRA-7399 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e649308 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e649308 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e649308 Branch: refs/heads/cassandra-2.1 Commit: 1e6493083f5d3a065f96994c7bf2d88975d3a7ba Parents: a175f70 Author: Sylvain Lebresne <[email protected]> Authored: Mon Jun 23 17:50:08 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Jun 23 17:50:08 2014 +0200 ---------------------------------------------------------------------- bin/cqlsh | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e649308/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index eca641b..c3a4ea6 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -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)
