chore(deps): update scylla driver (#6799)

juspay · Dec 16, 2024 · 71574a8 · 71574a8
1 parent 4b989fe
commit 71574a8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/masking/Cargo.toml b/crates/masking/Cargo.toml
@@ -28,7 +28,7 @@ subtle = "2.5.0"
 time = { version = "0.3.35", optional = true, features = ["serde-human-readable"] }
 url = { version = "2.5.0", features = ["serde"] }
 zeroize = { version = "1.7", default-features = false }
-scylla = { version = "0.14.0", optional = true}
+scylla = { git = "https://github.com/juspay/scylla-rust-driver.git",rev = "5700aa2847b25437cdd4fcf34d707aa90dca8b89", optional = true}
 
 [dev-dependencies]
 serde_json = "1.0.115"

diff --git a/crates/masking/src/cassandra.rs b/crates/masking/src/cassandra.rs
@@ -1,7 +1,6 @@
 use scylla::{
-    cql_to_rust::FromCqlVal,
     deserialize::DeserializeValue,
-    frame::response::result::{ColumnType, CqlValue},
+    frame::response::result::ColumnType,
     serialize::{
         value::SerializeValue,
         writers::{CellWriter, WrittenCellProof},
@@ -17,34 +16,25 @@ where
 {
     fn serialize<'b>(
         &self,
-        typ: &ColumnType,
+        typ: &ColumnType<'_>,
         writer: CellWriter<'b>,
     ) -> Result<WrittenCellProof<'b>, SerializationError> {
         self.peek().serialize(typ, writer)
     }
 }
 
-impl<'frame, T> DeserializeValue<'frame> for StrongSecret<T>
+impl<'frame, 'metadata, T> DeserializeValue<'frame, 'metadata> for StrongSecret<T>
 where
-    T: DeserializeValue<'frame> + zeroize::Zeroize + Clone,
+    T: DeserializeValue<'frame, 'metadata> + zeroize::Zeroize + Clone,
 {
-    fn type_check(typ: &ColumnType) -> Result<(), scylla::deserialize::TypeCheckError> {
+    fn type_check(typ: &ColumnType<'_>) -> Result<(), scylla::deserialize::TypeCheckError> {
         T::type_check(typ)
     }
 
     fn deserialize(
-        typ: &'frame ColumnType,
+        typ: &'metadata ColumnType<'metadata>,
         v: Option<scylla::deserialize::FrameSlice<'frame>>,
     ) -> Result<Self, scylla::deserialize::DeserializationError> {
         Ok(Self::new(T::deserialize(typ, v)?))
     }
 }
-
-impl<T> FromCqlVal<CqlValue> for StrongSecret<T>
-where
-    T: FromCqlVal<CqlValue> + zeroize::Zeroize + Clone,
-{
-    fn from_cql(cql_val: CqlValue) -> Result<Self, scylla::cql_to_rust::FromCqlValError> {
-        Ok(Self::new(T::from_cql(cql_val)?))
-    }
-}