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

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Mikhail Stepura 2014-02-21 15:39:59 -08:00
parent 143372bf7c 50e544f282
commit 0508a155e5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pylib/cqlshlib/cql3handling.py
View File

@ -760,7 +760,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':
@ -778,7 +778,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')
@ -786,6 +786,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):
@ -1262,4 +1263,4 @@ class UserTypesMeta(object):
def get_fields_with_types(self, ksname, typename):
return [(field[0], lookup_casstype(field[1]).cql_parameterized_type()) for field in
self._meta.get(ksname, {}).get(typename, [])]
self._meta.get(ksname, {}).get(typename, [])]