Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ac731ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ac731ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ac731ef Branch: refs/heads/trunk Commit: 8ac731efa0a7d67f16c117df507dd21bededfada Parents: 1c6b756 270d016 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Mar 27 14:31:03 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Mar 27 14:31:03 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 111 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 77 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ac731ef/bin/cqlsh ---------------------------------------------------------------------- diff --cc bin/cqlsh index 5ea3bd5,7431bee..2c3d410 --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -453,20 -416,14 +482,20 @@@ class Shell(cmd.Cmd) self.in_comment = False self.schema_overrides = {} - if sys.stdin.isatty(): - self.prompt = Shell.default_prompt + self.prompt = '' + if stdin is None: + stdin = sys.stdin + self.tty = tty + if tty: + self.prompt = self.default_prompt self.report_connection() - self.printout('Use HELP for help.') + print 'Use HELP for help.' else: - self.prompt = "" + self.show_line_nums = True + self.stdin = stdin + self.query_out = sys.stdout - def myformat_value(self, val, casstype): + def myformat_value(self, val, casstype, **kwargs): if isinstance(val, DecodeError): self.decoding_errors.append(val) return format_value(val, casstype, self.output_codec.name, @@@ -889,10 -802,11 +931,11 @@@ def print_dynamic_result(self, cursor): for row in cursor: colnames, coltypes = zip(*cursor.description)[:2] - colnames = [self.myformat_colname(name) for name in colnames] + colnames_t = [(name, self.get_nametype(cursor, n)) for (n, name) in enumerate(colnames)] + colnames = [self.myformat_colname(name, nametype) for (name, nametype) in colnames_t] colvals = [self.myformat_value(val, casstype) for (val, casstype) in zip(row, coltypes)] line = ' | '.join('%s,%s' % (n.coloredval, v.coloredval) for (n, v) in zip(colnames, colvals)) - print ' ' + line + self.writeresult(' ' + line) def emptyline(self): pass
