Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'ColumnType::Timeuuid' support for the prepared statements #83

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Add 'ColumnType::Timeuuid' support for the prepared statements #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 40 additions & 13 deletions src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use rune::{Any, Value};
use rust_embed::RustEmbed;
use scylla::_macro_internal::ColumnType;
use scylla::frame::response::result::CqlValue;
use scylla::frame::value::CqlTimeuuid;
use scylla::load_balancing::DefaultPolicy;
use scylla::prepared_statement::PreparedStatement;
use scylla::transport::errors::{DbError, NewSessionError, QueryError};
Expand Down Expand Up @@ -631,6 +632,29 @@ mod bind {
(Value::Float(v), ColumnType::Float) => Ok(CqlValue::Float(*v as f32)),
(Value::Float(v), ColumnType::Double) => Ok(CqlValue::Double(*v)),

(Value::StaticString(v), ColumnType::Timeuuid) => {
let timeuuid = CqlTimeuuid::from_str(v);
match timeuuid {
Ok(timeuuid) => Ok(CqlValue::Timeuuid(timeuuid)),
Err(e) => Err(CassError(CassErrorKind::WrongDataStructure(format!(
"Failed to parse '{}' StaticString as Timeuuid: {}",
v.as_str(),
e
)))),
}
}
(Value::String(v), ColumnType::Timeuuid) => {
let timeuuid_str = v.borrow_ref().unwrap();
let timeuuid = CqlTimeuuid::from_str(timeuuid_str.as_str());
match timeuuid {
Ok(timeuuid) => Ok(CqlValue::Timeuuid(timeuuid)),
Err(e) => Err(CassError(CassErrorKind::WrongDataStructure(format!(
"Failed to parse '{}' String as Timeuuid: {}",
timeuuid_str.as_str(),
e
)))),
}
}
(Value::StaticString(v), ColumnType::Text | ColumnType::Ascii) => {
Ok(CqlValue::Text(v.as_str().to_string()))
}
Expand All @@ -641,23 +665,23 @@ mod bind {
let ipaddr = IpAddr::from_str(v);
match ipaddr {
Ok(ipaddr) => Ok(CqlValue::Inet(ipaddr)),
Err(e) => {
Err(CassError(CassErrorKind::WrongDataStructure(
format!("Failed to parse '{}' StaticString as IP address: {}", v.as_str(), e),
)))
}
Err(e) => Err(CassError(CassErrorKind::WrongDataStructure(format!(
"Failed to parse '{}' StaticString as IP address: {}",
v.as_str(),
e
)))),
}
}
(Value::String(v), ColumnType::Inet) => {
let ipaddr_str = v.borrow_ref().unwrap();
let ipaddr = IpAddr::from_str(ipaddr_str.as_str());
match ipaddr {
Ok(ipaddr) => Ok(CqlValue::Inet(ipaddr)),
Err(e) => {
Err(CassError(CassErrorKind::WrongDataStructure(
format!("Failed to parse '{}' String as IP address: {}", ipaddr_str.as_str(), e),
)))
}
Err(e) => Err(CassError(CassErrorKind::WrongDataStructure(format!(
"Failed to parse '{}' String as IP address: {}",
ipaddr_str.as_str(),
e
)))),
}
}

Expand All @@ -667,7 +691,7 @@ mod bind {
(Value::Option(v), typ) => match v.borrow_ref().unwrap().as_ref() {
Some(v) => to_scylla_value(v, typ),
None => Ok(CqlValue::Empty),
}
},
(Value::Vec(v), ColumnType::List(elt)) => {
let v = v.borrow_ref().unwrap();
let elements = v
Expand Down Expand Up @@ -696,8 +720,11 @@ mod bind {
.filter_map(|tuple_wrapped| {
if let Value::Tuple(tuple_wrapped) = &tuple_wrapped {
let tuple = tuple_wrapped.borrow_ref().unwrap();
let key = to_scylla_value(tuple.get(0).unwrap(), key_elt).unwrap();
let value = to_scylla_value(tuple.get(1).unwrap(), value_elt).unwrap();
let key = to_scylla_value(tuple.get(0).unwrap(), key_elt)
.unwrap();
let value =
to_scylla_value(tuple.get(1).unwrap(), value_elt)
.unwrap();
Some((key, value))
} else {
None
Expand Down
Loading