Change string output of table definition to put parenthesis around a single partition key. Details in CASSANDRA-7274

pmcfadin · pmcfadin · commit 899c31e256fe · 2014-05-26T07:54:55.000-07:00
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
@@ -718,10 +718,8 @@ def as_cql_query(self, formatted=False):
         if len(self.partition_key) > 1 or self.clustering_key:
             ret += "%s%sPRIMARY KEY (" % (column_join, padding)
 
-            if len(self.partition_key) > 1:
-                ret += "(%s)" % ", ".join(protect_name(col.name) for col in self.partition_key)
-            else:
-                ret += self.partition_key[0].name
+            # Changed as part of CASSANDRA-7274
+            ret += "(%s)" % ", ".join(protect_name(col.name) for col in self.partition_key)
 
             if self.clustering_key:
                 ret += ", %s" % ", ".join(protect_name(col.name) for col in self.clustering_key)
