sentry - move postgres fields into primitives

Author: elpiel

primitives/src/lib.rs

@@ -25,6 +25,16 @@ pub mod util {
     pub mod serde;
 }
 pub mod validator;
+#[cfg(feature = "postgres")]
+pub mod postgres {
+    pub mod field {
+        pub use bignum::BigNumPg;
+        pub use channel_id::ChannelIdPg;
+
+        mod bignum;
+        mod channel_id;
+    }
+}
 
 pub use self::ad_unit::AdUnit;
 pub use self::balances_map::BalancesMap;

sentry/src/db/field/bignum.rs renamed to primitives/src/postgres/field/bignum.rs

@@ -1,12 +1,12 @@
 use std::error::Error;
 
-use bb8_postgres::tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
+use postgres_types::{FromSql, IsNull, ToSql, Type};
 
+use crate::BigNum;
 use bytes::BytesMut;
-use primitives::BigNum;
 
 #[derive(Debug)]
-pub(crate) struct BigNumPg(BigNum);
+pub struct BigNumPg(BigNum);
 
 impl Into<BigNum> for BigNumPg {
     fn into(self) -> BigNum {

sentry/src/db/field/channel_id.rs renamed to primitives/src/postgres/field/channel_id.rs

@@ -1,12 +1,10 @@
 use std::error::Error;
 
-use bb8_postgres::tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
-
-use bytes::BytesMut;
-use primitives::channel::ChannelId;
+use crate::ChannelId;
+use postgres_types::{FromSql, Type};
 
 #[derive(Debug)]
-pub(crate) struct ChannelIdPg(ChannelId);
+pub struct ChannelIdPg(ChannelId);
 
 impl Into<ChannelId> for ChannelIdPg {
     fn into(self) -> ChannelId {
@@ -19,7 +17,6 @@ impl<'a> FromSql<'a> for ChannelIdPg {
         let str_slice = <&str as FromSql>::from_sql(ty, raw)?;
 
         // @TODO: Add this check back!
-
         //        if result.len() != 32 {
         //            return Err(DomainError::InvalidArgument(format!(
         //                "Invalid validator id value {}",
@@ -30,21 +27,7 @@ impl<'a> FromSql<'a> for ChannelIdPg {
         let mut id: [u8; 32] = [0; 32];
         id.copy_from_slice(&hex::decode(str_slice)?);
 
-        Ok(ChannelIdPg(id))
-    }
-
-    fn accepts(ty: &Type) -> bool {
-        match *ty {
-            Type::TEXT | Type::VARCHAR => true,
-            _ => false,
-        }
-    }
-}
-
-impl ToSql for ChannelIdPg {
-    fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let string = hex::encode(&self.0);
-        <String as ToSql>::to_sql(&string, ty, w)
+        Ok(ChannelIdPg(id.into()))
     }
 
     fn accepts(ty: &Type) -> bool {
@@ -53,13 +36,4 @@ impl ToSql for ChannelIdPg {
             _ => false,
         }
     }
-
-    fn to_sql_checked(
-        &self,
-        ty: &Type,
-        out: &mut BytesMut,
-    ) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let string = hex::encode(&self.0);
-        <String as ToSql>::to_sql_checked(&string, ty, out)
-    }
 }

sentry/src/db.rs

@@ -8,14 +8,6 @@ use lazy_static::lazy_static;
 
 pub type DbPool = Pool<PostgresConnectionManager<NoTls>>;
 
-pub mod field {
-    pub(crate) use bignum::BigNumPg;
-    pub(crate) use channel_id::ChannelIdPg;
-
-    mod bignum;
-    mod channel_id;
-}
-
 lazy_static! {
     static ref REDIS_URL: String =
         std::env::var("REDIS_URL").unwrap_or_else(|_| String::from("redis://127.0.0.1:6379"));