Merge branch 'cassandra-1.2' into cassandra-2.0

This commit is contained in:
Mikhail Stepura 2014-02-21 15:39:34 -08:00
commit 50e544f282
1 changed files with 3 additions and 2 deletions

View File

@ -723,7 +723,7 @@ def update_countername_completer(ctxt, cass):
cqltype = layout.get_column(curcol).cqltype
coltype = cqltype.typename
if coltype == 'counter':
return maybe_escape_name(curcol)
return [maybe_escape_name(curcol)]
if coltype in ('map', 'set'):
return ["{"]
if coltype == 'list':
@ -741,7 +741,7 @@ def update_counter_inc_completer(ctxt, cass):
layout = get_cf_layout(ctxt, cass)
curcol = dequote_name(ctxt.get_binding('updatecol', ''))
if layout.is_counter_col(curcol):
return Hint('<wholenumber>')
return [Hint('<wholenumber>')]
return []
@completer_for('assignment', 'listadder')
@ -749,6 +749,7 @@ def update_listadder_completer(ctxt, cass):
rhs = ctxt.get_binding('update_rhs')
if rhs.startswith('['):
return ['+']
return []
@completer_for('assignment', 'listcol')
def update_listcol_completer(ctxt, cass):