Missing commit from 4594 merge.

apache · Sep 18, 2012 · 09d3e7f · 09d3e7f
1 parent 60bf68c
commit 09d3e7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/bin/cqlsh b/bin/cqlsh
@@ -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):

diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
@@ -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