Merge branch 'dev' into issue-151-migrations

elpiel · web-flow · commit caf60c0c093d · 2019-11-21T14:42:17.000+02:00
diff --git a/primitives/src/channel.rs b/primitives/src/channel.rs
@@ -208,7 +208,7 @@ pub mod postgres {
         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)?;
 
-            Ok(ChannelId::from_hex(str_slice)?)
+            Ok(ChannelId::from_hex(&str_slice[2..])?)
         }
 
         fn accepts(ty: &Type) -> bool {

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ pub mod postgres {`
`208`	`208`	`fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {`
`209`	`209`	`let str_slice = <&str as FromSql>::from_sql(ty, raw)?;`
`210`	`210`
`211`		`- Ok(ChannelId::from_hex(str_slice)?)`
	`211`	`+ Ok(ChannelId::from_hex(&str_slice[2..])?)`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`fn accepts(ty: &Type) -> bool {`