Repository: cassandra Updated Branches: refs/heads/trunk fda0754c1 -> 67ffe366a
Follow-up to CASSANDRA-10513 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f1700a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f1700a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f1700a6 Branch: refs/heads/trunk Commit: 1f1700a67c9d1365d1ecf74eb8dc7c2b0962a0c1 Parents: b761b86 Author: Paulo Motta <pauloricard...@gmail.com> Authored: Wed Nov 4 15:46:53 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 15:46:53 2015 +0000 ---------------------------------------------------------------------- bin/cqlsh.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f1700a6/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index c92a6b9..725f6e9 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -1228,12 +1228,12 @@ class Shell(cmd.Cmd): return False, None if statement.query_string[:6].lower() == 'select': - self.print_result(result, self.parse_for_table_meta(statement.query_string)) + self.print_result(result, self.parse_for_select_meta(statement.query_string)) elif statement.query_string.lower().startswith("list users") or statement.query_string.lower().startswith("list roles"): self.print_result(result, self.get_table_meta('system_auth', 'roles')) elif statement.query_string.lower().startswith("list"): self.print_result(result, self.get_table_meta('system_auth', 'role_permissions')) - elif rows: + elif result: # CAS INSERT/UPDATE self.writeresult("") self.print_static_result(list(result), self.parse_for_update_meta(statement.query_string)) @@ -1254,8 +1254,8 @@ class Shell(cmd.Cmd): if result.has_more_pages: raw_input("---MORE---") result.fetch_next_page() - else: - break + else: + break else: rows = list(result) num_rows = len(rows) @@ -2397,7 +2397,7 @@ class ImportProcess(multiprocessing.Process): cqltypes = [table_meta.columns[name].typestring for name in self.columns] pk_indexes = [self.columns.index(col.name) for col in table_meta.primary_key] query = 'INSERT INTO %s.%s (%s) VALUES (%%s)' % ( - protect_name(table_meta.keyspace.name), + protect_name(table_meta.keyspace_name), protect_name(table_meta.name), ', '.join(protect_names(self.columns)))
