ValidationError for invalid UUID types

aholmberg · aholmberg · commit 8e565d06ab94 · 2015-05-29T11:03:39.000-05:00
Follow-on to apache#335. Fixes issue where non-string or UUID types would return None from UUID.validate. Also removed test that did not do what it purported (previously inserting None for key instead of value, and failing for Validation of UUID and not key).
diff --git a/cassandra/cqlengine/columns.py b/cassandra/cqlengine/columns.py
@@ -528,8 +528,10 @@ def validate(self, value):
             try:
                 return _UUID(val)
             except ValueError:
-                raise ValidationError("{} {} is not a valid uuid".format(
-                    self.column_name, value))
+                # fall-through to error
+                pass
+        raise ValidationError("{} {} is not a valid uuid".format(
+            self.column_name, value))
 
     def to_python(self, value):
         return self.validate(value)
@@ -824,6 +826,8 @@ def validate(self, value):
             return
         if not isinstance(val, dict):
             raise ValidationError('{} {} is not a dict object'.format(self.column_name, val))
+        if None in val:
+            raise ValidationError("{} None is not allowed in a map".format(self.column_name))
         return {self.key_col.validate(k): self.value_col.validate(v) for k, v in val.items()}
 
     def to_python(self, value):
diff --git a/tests/integration/cqlengine/columns/test_container_columns.py b/tests/integration/cqlengine/columns/test_container_columns.py
@@ -345,8 +345,6 @@ def test_blind_list_updates_from_none(self):
         assert m3.int_list == []
 
 class TestMapModel(Model):
-
-
     partition = columns.UUID(primary_key=True, default=uuid4)
     int_map = columns.Map(columns.Integer, columns.UUID, required=False)
     text_map = columns.Map(columns.Text, columns.DateTime, required=False)
@@ -371,11 +369,7 @@ def test_empty_default(self):
 
     def test_add_none_as_map_key(self):
         with self.assertRaises(ValidationError):
-            TestMapModel.create(int_map={None:1})
-
-    def test_add_none_as_map_value(self):
-        with self.assertRaises(ValidationError):
-            TestMapModel.create(int_map={None:1})
+            TestMapModel.create(int_map={None: uuid4()})
 
     def test_empty_retrieve(self):
         tmp = TestMapModel.create()
