natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Follow-up to CASSANDRA-10513

This commit is contained in:
Paulo Motta 2015-11-04 15:46:53 +00:00 committed by Aleksey Yeschenko
parent b761b8659b
commit 1f1700a67c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/cqlsh.py
View File

@ -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)))