Permalink
Browse files

Missing commit from 4594 merge.

  • Loading branch information...
1 parent 60bf68c commit 09d3e7f7f7f795fb14b4193b89db399f79c82990 @driftx driftx committed Sep 18, 2012
Showing with 4 additions and 0 deletions.
  1. +2 −0 bin/cqlsh
  2. +2 −0 pylib/cqlshlib/cql3handling.py
View
@@ -1081,6 +1081,8 @@ class Shell(cmd.Cmd):
self.prompt = prompt
def cql_protect_name(self, name):
+ if isinstance(name, unicode):
+ name = name.encode('utf8')
return cqlruleset.maybe_escape_name(name)
def cql_protect_value(self, value):
@@ -884,6 +884,7 @@ def parse_types_compact(self):
value_cols = [self.column_class(self.value_alias, self.default_validator)]
else:
value_cols = map(self.column_class.from_layout, self.coldefs)
+ value_cols.sort(key=lambda c: c.name)
return partkey_cols + colalias_cols + value_cols
@@ -918,6 +919,7 @@ def parse_types_dynamic(self):
warn(UnexpectedTableStructure("Dynamic storage CF has a value_alias (%r)"
% (self.value_alias,)))
value_cols = map(self.column_class.from_layout, self.coldefs)
+ value_cols.sort(key=lambda c: c.name)
return partkey_cols + colalias_cols + value_cols

0 comments on commit 09d3e7f

Please sign in to comment.