Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0aca1b9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0aca1b9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0aca1b9d Branch: refs/heads/cassandra-3.11 Commit: 0aca1b9df8b594710e6fbe820bd54ed17dc3176e Parents: d8b7630 21ec39a Author: Mick Semb Wever <m...@apache.org> Authored: Wed Sep 5 11:19:22 2018 +1000 Committer: Mick Semb Wever <m...@apache.org> Committed: Wed Sep 5 11:20:12 2018 +1000 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aca1b9d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aca1b9d/bin/cqlsh.py ---------------------------------------------------------------------- diff --cc bin/cqlsh.py index 801a8f7,1f1fa47..71f8491 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1116,14 -1374,7 +1116,14 @@@ class Shell(cmd.Cmd) # print header only self.print_formatted_result(formatted_names, None) return - formatted_values = [map(self.myformat_value, [row[column] for column in column_names]) for row in rows] + + cql_types = [] + if result.column_types: + ks_name = table_meta.keyspace_name if table_meta else self.current_keyspace + ks_meta = self.conn.metadata.keyspaces.get(ks_name, None) + cql_types = [CqlType(cql_typename(t), ks_meta) for t in result.column_types] + - formatted_values = [map(self.myformat_value, row.values(), cql_types) for row in result.current_rows] ++ formatted_values = [map(self.myformat_value, [row[column] for column in column_names], cql_types) for row in result.current_rows] if self.expand_enabled: self.print_formatted_result_vertically(formatted_names, formatted_values) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
