collection: typecheck value on append

Author: muzarski

scylla-rust-wrapper/src/collection.rs

@@ -1,8 +1,8 @@
-use crate::argconv::*;
 use crate::cass_error::CassError;
 use crate::cass_types::CassDataType;
 use crate::types::*;
 use crate::value::CassCqlValue;
+use crate::{argconv::*, value};
 use std::convert::TryFrom;
 use std::sync::Arc;
 
@@ -32,8 +32,49 @@ pub struct CassCollection {
 }
 
 impl CassCollection {
+    fn typecheck_on_append(&self, value: &Option<CassCqlValue>) -> CassError {
+        // See https://github.com/scylladb/cpp-driver/blob/master/src/collection.hpp#L100.
+        let index = self.items.len();
+
+        // Do validation only if it's a typed collection.
+        if let Some(data_type) = &self.data_type {
+            match data_type.as_ref() {
+                CassDataType::List { typ: subtype, .. }
+                | CassDataType::Set { typ: subtype, .. } => match subtype {
+                    Some(subtype) => {
+                        if !value::is_type_compatible(value, subtype) {
+                            return CassError::CASS_ERROR_LIB_INVALID_VALUE_TYPE;
+                        }
+                    }
+                    None => {}
+                },
+                CassDataType::Map {
+                    key_type: k_typ,
+                    val_type: v_typ,
+                    ..
+                } => {
+                    // Only do the typecheck if both map types are present.
+                    if let (Some(k_typ), Some(v_typ)) = (k_typ, v_typ) {
+                        if index % 2 == 0 && !value::is_type_compatible(value, k_typ) {
+                            return CassError::CASS_ERROR_LIB_INVALID_VALUE_TYPE;
+                        }
+                        if !value::is_type_compatible(value, v_typ) {
+                            return CassError::CASS_ERROR_LIB_INVALID_VALUE_TYPE;
+                        }
+                    }
+                }
+                _ => return CassError::CASS_ERROR_LIB_INVALID_VALUE_TYPE,
+            }
+        }
+
+        CassError::CASS_OK
+    }
+
     pub fn append_cql_value(&mut self, value: Option<CassCqlValue>) -> CassError {
-        // FIXME: Bounds check, type check
+        let err = self.typecheck_on_append(&value);
+        if err != CassError::CASS_OK {
+            return err;
+        }
         // There is no API to append null, so unwrap is safe
         self.items.push(value.unwrap());
         CassError::CASS_OK