cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject git commit: Fix CompositeType columns in DESCRIBE TABLE output
Date Wed, 25 Jun 2014 14:52:51 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 e39e9e593 -> 66e1e4610


Fix CompositeType columns in DESCRIBE TABLE output

Patch by Mikhail Stepura; reviewed by Tyler Hobbs 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/66e1e461
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66e1e461
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66e1e461

Branch: refs/heads/cassandra-1.2
Commit: 66e1e4610983d827b8d120b44d1709c406d8bf9b
Parents: e39e9e5
Author: Mikhail Stepura <mishail@apache.org>
Authored: Wed Jun 25 09:52:08 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Jun 25 09:52:08 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 bin/cqlsh   | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e1e461/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f837515..6adef97 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.17
+ * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
  * Expose global ColmunFamily metrics (CASSANDRA-7273)
  * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
  * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e1e461/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index cec9aac..bb0ffdf 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -552,6 +552,8 @@ class Shell(cmd.Cmd):
         self.stdin = stdin
         self.query_out = sys.stdout
         self.statement_error = False
+        # see CASSANDRA-7399
+        cql.cqltypes.CompositeType.cql_parameterized_type = classmethod(lambda cls: "'%s'"
% cls.cass_parameterized_type_with(cls.subtypes, True))
 
     def set_expanded_cql_version(self, ver):
         ver, vertuple = full_cql_version(ver)


Mime
View raw message