You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/05/06 18:31:24 UTC

svn commit: r1100274 - /cassandra/branches/cassandra-0.8/drivers/py/cql/decoders.py

Author: jbellis
Date: Fri May  6 16:31:23 2011
New Revision: 1100274

URL: http://svn.apache.org/viewvc?rev=1100274&view=rev
Log:
fix nulls not appearing in python cql resultsets
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2613

Modified:
    cassandra/branches/cassandra-0.8/drivers/py/cql/decoders.py

Modified: cassandra/branches/cassandra-0.8/drivers/py/cql/decoders.py
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/drivers/py/cql/decoders.py?rev=1100274&r1=1100273&r2=1100274&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/drivers/py/cql/decoders.py (original)
+++ cassandra/branches/cassandra-0.8/drivers/py/cql/decoders.py Fri May  6 16:31:23 2011
@@ -59,11 +59,11 @@ class SchemaDecoder(object):
         unmarshal = unmarshallers.get(comparator, unmarshal_noop)
         values = [key]
         for column in row.columns:
-            if column.value == None:
-                continue
-
             description.append((unmarshal(column.name), comparator, None, None, None, None, True))
             validator = self.__validator_for(keyspace, column_family, column.name)
-            values.append(unmarshallers.get(validator, unmarshal_noop)(column.value))
+            if column.value is None:
+                values.append(None)
+            else:
+                values.append(unmarshallers.get(validator, unmarshal_noop)(column.value))
 
         return description, values