Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 4595ec03f -> 13b4bb41c
cqlsh prompt includes name of keyspace after failed `use` statement patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10369 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13b4bb41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13b4bb41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13b4bb41 Branch: refs/heads/cassandra-2.2 Commit: 13b4bb41c7e35502ae36e4ec77252c5ec9a9945b Parents: 4595ec0 Author: Robert Stupp <[email protected]> Authored: Tue Sep 29 13:22:21 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Tue Sep 29 13:22:21 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13b4bb41/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7e6f1e0..f3a6d44 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.2 + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) * Configurable page size in cqlsh (CASSANDRA-9855) * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) * Cancel transaction for sstables we wont redistribute index summary http://git-wip-us.apache.org/repos/asf/cassandra/blob/13b4bb41/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 6ff3a96..e2691cc 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -1116,7 +1116,8 @@ class Shell(cmd.Cmd): def do_use(self, parsed): ksname = parsed.get_binding('ksname') - if self.perform_simple_statement(SimpleStatement(parsed.extract_orig())): + result, future = self.perform_simple_statement(SimpleStatement(parsed.extract_orig())) + if result: if ksname[0] == '"' and ksname[-1] == '"': self.current_keyspace = self.cql_unprotect_name(ksname) else:
