Repository: cassandra Updated Branches: refs/heads/trunk d1af97927 -> c9240e7e8
cqlsh: always emphasize the partition key in DESC output patch by Patrick McFadin; reviewed by Aleksey Yeschenko for CASSANDRA-7274 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6faf80c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6faf80c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6faf80c9 Branch: refs/heads/trunk Commit: 6faf80c9d267ede53c139b5f2a39e8e56ee80b2a Parents: 6d8be12 Author: Patrick McFadin <patr...@datastax.com> Authored: Sun May 25 18:14:39 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun May 25 18:14:39 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6faf80c9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c6c51c3..b8c3963 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ 2.0.9 * Add missing iso8601 patterns for date strings (6973) * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) 2.0.8 * Always reallocate buffers in HSHA (CASSANDRA-6285) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6faf80c9/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index 6575387..75c4299 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -1136,10 +1136,10 @@ class Shell(cmd.Cmd): out.write(" PRIMARY KEY (") partkeynames = self.cql_protect_names(layout.partition_key_columns) - if len(partkeynames) > 1: - partkey = "(%s)" % ', '.join(partkeynames) - else: - partkey = partkeynames[0] + + # Changed to put parenthesis around one or more partition keys in CASSANDRA-7274 + partkey = "(%s)" % ', '.join(partkeynames) + pk_parts = [partkey] + self.cql_protect_names(layout.clustering_key_columns) out.write(', '.join(pk_parts) + ')')