From ab793c7f3bdc17a8de584d0910aa9f5c4978dfa0 Mon Sep 17 00:00:00 2001 From: Pavel Trukhanov Date: Thu, 3 Mar 2016 14:58:35 +0300 Subject: [PATCH] (cqlsh) Show static columns in a different color patch by Pavel Trukhanov; reviewed by yukim for CASSANDRA-11059 --- CHANGES.txt | 1 + bin/cqlsh.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 03891f37e8..cd9d8d9594 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.6 + * (cqlsh) Show static columns in a different color (CASSANDRA-11059) * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 78fedeb844..71a5fcb684 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -169,7 +169,7 @@ if os.path.isdir(cqlshlibdir): from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling from cqlshlib.copyutil import ExportTask, ImportTask from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN, - RED, FormattedValue, colorme) + RED, WHITE, FormattedValue, colorme) from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT, DEFAULT_TIMESTAMP_FORMAT, DateTimeFormat, format_by_type, format_value_utype, @@ -841,6 +841,8 @@ class Shell(cmd.Cmd): column_colors.default_factory = lambda: RED elif name in [col.name for col in table_meta.clustering_key]: column_colors.default_factory = lambda: CYAN + elif name in table_meta.columns and table_meta.columns[name].is_static: + column_colors.default_factory = lambda: WHITE return self.myformat_value(name, colormap=column_colors) def report_connection(self):