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

cqlsh: always emphasize the partition key in DESC output 

patch by Patrick McFadin; reviewed by Aleksey Yeschenko for
CASSANDRA-7274
This commit is contained in:
Patrick McFadin 2014-05-25 18:14:39 +03:00 committed by Aleksey Yeschenko
parent 6d8be12a15
commit 6faf80c9d2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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)

8
bin/cqlsh
View File

@ -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) + ')')