Permalink
Browse files

cqlsh: always emphasize the partition key in DESC output

patch by Patrick McFadin; reviewed by Aleksey Yeschenko for
CASSANDRA-7274
  • Loading branch information...
1 parent 6d8be12 commit 6faf80c9d267ede53c139b5f2a39e8e56ee80b2a @pmcfadin pmcfadin committed with iamaleksey May 25, 2014
Showing with 5 additions and 4 deletions.
  1. +1 −0 CHANGES.txt
  2. +4 −4 bin/cqlsh
View
@@ -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)
View
@@ -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) + ')')

0 comments on commit 6faf80c

Please sign in to comment.