move FromSql/ToSql impl to primitives behind a flag postgres

elpiel · elpiel · commit 2703d3c9d9bd · 2019-11-15T11:33:05.000+02:00
diff --git a/primitives/src/big_num.rs b/primitives/src/big_num.rs
@@ -222,6 +222,55 @@ where
     serializer.serialize_str(&num.to_str_radix(10))
 }
 
+#[cfg(feature = "postgres")]
+pub mod postgres {
+    use super::BigNum;
+    use bytes::BytesMut;
+    use postgres_types::{FromSql, IsNull, ToSql, Type};
+    use std::error::Error;
+
+    impl<'a> FromSql<'a> for BigNum {
+        fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<BigNum, Box<dyn Error + Sync + Send>> {
+            use std::convert::TryInto;
+
+            let str_slice = <&str as FromSql>::from_sql(ty, raw)?;
+
+            Ok(str_slice.try_into()?)
+        }
+
+        fn accepts(ty: &Type) -> bool {
+            match *ty {
+                Type::TEXT | Type::VARCHAR => true,
+                _ => false,
+            }
+        }
+    }
+
+    impl ToSql for BigNum {
+        fn to_sql(
+            &self,
+            ty: &Type,
+            w: &mut BytesMut,
+        ) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+            <String as ToSql>::to_sql(&self.0.to_string(), ty, w)
+        }
+
+        fn accepts(ty: &Type) -> bool {
+            match *ty {
+                Type::TEXT | Type::VARCHAR => true,
+                _ => false,
+            }
+        }
+
+        fn to_sql_checked(
+            &self,
+            ty: &Type,
+            out: &mut BytesMut,
+        ) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+            <String as ToSql>::to_sql_checked(&self.0.to_string(), ty, out)
+        }
+    }
+}
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/primitives/src/channel.rs b/primitives/src/channel.rs
@@ -193,3 +193,29 @@ impl Error for ChannelError {
         None
     }
 }
+
+#[cfg(feature = "postgres")]
+pub mod postgres {
+    use super::ChannelId;
+    use hex::FromHex;
+    use postgres_types::{FromSql, Type};
+    use std::error::Error;
+
+    impl<'a> FromSql<'a> for ChannelId {
+        fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {
+            let str_slice = <&str as FromSql>::from_sql(ty, raw)?;
+
+            // FromHex::from_hex for fixed-sized arrays will guard against the length of the string!
+            let id: [u8; 32] = <[u8; 32] as FromHex>::from_hex(str_slice)?;
+
+            Ok(ChannelId(id))
+        }
+
+        fn accepts(ty: &Type) -> bool {
+            match *ty {
+                Type::TEXT | Type::VARCHAR => true,
+                _ => false,
+            }
+        }
+    }
+}
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -25,16 +25,6 @@ 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;
diff --git a/primitives/src/postgres/field/bignum.rs b/primitives/src/postgres/field/bignum.rs
diff --git a/primitives/src/postgres/field/channel_id.rs b/primitives/src/postgres/field/channel_id.rs
diff --git a/sentry/src/middleware/channel.rs b/sentry/src/middleware/channel.rs
@@ -3,9 +3,7 @@ use crate::ResponseError;
 use bb8::RunError;
 use bb8_postgres::tokio_postgres::{types::Json, Row};
 use hyper::{Body, Request};
-use primitives::channel::ChannelId;
-use primitives::postgres::field::{BigNumPg, ChannelIdPg};
-use primitives::{Channel, ChannelSpec};
+use primitives::{Channel, ChannelId, ChannelSpec};
 
 pub async fn channel_load(
     mut req: Request<Body>,
@@ -44,10 +42,10 @@ pub async fn get_channel(
 
 fn channel_map(row: &Row) -> Channel {
     Channel {
-        id: row.get::<_, ChannelIdPg>("channel_id").into(),
+        id: row.get("channel_id"),
         creator: row.get("creator"),
         deposit_asset: row.get("deposit_asset"),
-        deposit_amount: row.get::<_, BigNumPg>("deposit_amount").into(),
+        deposit_amount: row.get("deposit_amount"),
         valid_until: row.get("valid_until"),
         spec: row.get::<_, Json<ChannelSpec>>("spec").0,
     }
