Fix string params bind

Author: wyhaya

crossdb

@@ -234,17 +234,17 @@ mod tests {
 
         let row1 = query.fetch_row().unwrap();
         assert_eq!(row1.get(0), &Value::I32(1));
-        // assert_eq!(row1.get(1), &Value::String("Alex"));
+        assert_eq!(row1.get(1), &Value::String("Alex"));
         assert_eq!(row1.get(2), &Value::I32(18));
 
         let row2 = query.fetch_row().unwrap();
         assert_eq!(row2.get(0), &Value::I32(2));
-        // assert_eq!(row2.get(1), &Value::String("Thorne"));
+        assert_eq!(row2.get(1), &Value::String("Thorne"));
         assert_eq!(row2.get(2), &Value::I32(22));
 
         let row3 = query.fetch_row().unwrap();
         assert_eq!(row3.get(0), &Value::I32(3));
-        // assert_eq!(row3.get(1), &Value::String("Ryder"));
+        assert_eq!(row3.get(1), &Value::String("Ryder"));
         assert_eq!(row3.get(2), &Value::I32(36));
 
         assert!(query.fetch_row().is_none());

src/lib.rs

@@ -5,7 +5,7 @@ pub enum Value {
     Int64(i64),
     Float(f32),
     Double(f64),
-    String(String),
+    String(CString),
 }
 
 trait IntoValue {
@@ -31,11 +31,22 @@ impl_value!(u64, Int64);
 impl_value!(i64, Int64);
 impl_value!(f32, Float);
 impl_value!(f64, Double);
-impl_value!(String, String);
+
+impl IntoValue for String {
+    fn into_value(self) -> Result<Value> {
+        Ok(Value::String(CString::new(self)?))
+    }
+}
 
 impl IntoValue for &str {
     fn into_value(self) -> Result<Value> {
-        Ok(Value::String(self.into()))
+        Ok(Value::String(CString::new(self)?))
+    }
+}
+
+impl IntoValue for CString {
+    fn into_value(self) -> Result<Value> {
+        Ok(Value::String(self))
     }
 }
 
@@ -50,25 +61,6 @@ pub enum Params {
     Positional(Vec<Value>),
 }
 
-impl Params {
-    pub(crate) unsafe fn bind(ptr: *mut xdb_stmt_t, params: Vec<Value>) -> Result<()> {
-        for (i, p) in params.into_iter().enumerate() {
-            let i = i as u16 + 1;
-            let ret = match p {
-                ParamValue::Int(v) => xdb_bind_int(ptr, i, v),
-                ParamValue::Int64(v) => xdb_bind_int64(ptr, i, v),
-                ParamValue::Float(v) => xdb_bind_float(ptr, i, v),
-                ParamValue::Double(v) => xdb_bind_double(ptr, i, v),
-                ParamValue::String(v) => xdb_bind_str(ptr, i, CString::new(v)?.as_ptr()),
-            };
-            if ret != 0 {
-                return Err(Error::BindParams);
-            }
-        }
-        Ok(())
-    }
-}
-
 pub trait IntoParams {
     fn into_params(self) -> Result<Params>;
 }

src/params.rs

@@ -18,10 +18,24 @@ impl Statement {
     pub fn query(&self, params: impl IntoParams) -> Result<Query> {
         unsafe {
             let params = params.into_params()?;
-            if let Params::Positional(params) = params {
-                if !params.is_empty() {
-                    self.clear_bindings()?;
-                    Params::bind(self.ptr, params)?;
+            // Here we use the &params
+            // Ensure that 'ParamValue::String' is not released before 'xdb_stmt_exec'.
+            if let Params::Positional(params) = &params {
+                self.clear_bindings()?;
+                for (i, p) in params.iter().enumerate() {
+                    let i = i as u16 + 1;
+                    let ret = match p {
+                        ParamValue::Int(v) => xdb_bind_int(self.ptr, i, *v),
+                        ParamValue::Int64(v) => xdb_bind_int64(self.ptr, i, *v),
+                        ParamValue::Float(v) => xdb_bind_float(self.ptr, i, *v),
+                        ParamValue::Double(v) => xdb_bind_double(self.ptr, i, *v),
+                        ParamValue::String(v) => {
+                            xdb_bind_str2(self.ptr, i, v.as_ptr(), v.as_bytes().len() as i32)
+                        }
+                    };
+                    if ret != 0 {
+                        return Err(Error::BindParams);
+                    }
                 }
             }
             let ptr = xdb_stmt_exec(self.ptr);