Commita638ada

authored

Merge pull request#877 from timando/cidr

Add ToSql / FromSql for IpInet and IpCidr from cidr crate

2 parents25cabd5 +27039f6 commita638adaCopy full SHA for a638ada

File tree

+50

-0

lines changed

+50

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ categories = ["database"]`
`14`	`14`	`derive = ["postgres-derive"]`
`15`	`15`	`array-impls = ["array-init"]`
`16`	`16`	`with-bit-vec-0_6 = ["bit-vec-06"]`
	`17`	`+with-cidr-0_2 = ["cidr-02"]`
`17`	`18`	`with-chrono-0_4 = ["chrono-04"]`
`18`	`19`	`with-eui48-0_4 = ["eui48-04"]`
`19`	`20`	`with-eui48-1 = ["eui48-1"]`
`@@ -33,6 +34,7 @@ postgres-derive = { version = "0.4.0", optional = true, path = "../postgres-deri`
`33`	`34`	`array-init = {version ="2",optional =true }`
`34`	`35`	`bit-vec-06 = {version ="0.6",package ="bit-vec",optional =true }`
`35`	`36`	`chrono-04 = {version ="0.4.16",package ="chrono",default-features =false,features = ["clock"],optional =true }`
	`37`	`+cidr-02 = {version ="0.2",package ="cidr",optional =true }`
`36`	`38`	`eui48-04 = {version ="0.4",package ="eui48",optional =true }`
`37`	`39`	`eui48-1 = {version ="1.0",package ="eui48",optional =true }`
`38`	`40`	`geo-types-06 = {version ="0.6",package ="geo-types",optional =true }`

Lines changed: 44 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,44 @@`
	`1`	`+use bytes::BytesMut;`
	`2`	`+use cidr_02::{IpCidr,IpInet};`
	`3`	`+use postgres_protocol::types;`
	`4`	`+use std::error::Error;`
	`5`	`+`
	`6`	`+usecrate::{FromSql,IsNull,ToSql,Type};`
	`7`	`+`
	`8`	`+impl<'a>FromSql<'a>forIpCidr{`
	`9`	`+fnfrom_sql(_:&Type,raw:&[u8]) ->Result<Self,Box<dynError +Sync +Send>>{`
	`10`	`+let inet = types::inet_from_sql(raw)?;`
	`11`	`+Ok(IpCidr::new(inet.addr(), inet.netmask())?)`
	`12`	`+}`
	`13`	`+`
	`14`	`+accepts!(CIDR);`
	`15`	`+}`
	`16`	`+`
	`17`	`+implToSqlforIpCidr{`
	`18`	`+fnto_sql(&self, _:&Type,w:&mutBytesMut) ->Result<IsNull,Box<dynError +Sync +Send>>{`
	`19`	`+ types::inet_to_sql(self.first_address(),self.network_length(), w);`
	`20`	`+Ok(IsNull::No)`
	`21`	`+}`
	`22`	`+`
	`23`	`+accepts!(CIDR);`
	`24`	`+to_sql_checked!();`
	`25`	`+}`
	`26`	`+`
	`27`	`+impl<'a>FromSql<'a>forIpInet{`
	`28`	`+fnfrom_sql(_:&Type,raw:&[u8]) ->Result<Self,Box<dynError +Sync +Send>>{`
	`29`	`+let inet = types::inet_from_sql(raw)?;`
	`30`	`+Ok(IpInet::new(inet.addr(), inet.netmask())?)`
	`31`	`+}`
	`32`	`+`
	`33`	`+accepts!(INET);`
	`34`	`+}`
	`35`	`+`
	`36`	`+implToSqlforIpInet{`
	`37`	`+fnto_sql(&self, _:&Type,w:&mutBytesMut) ->Result<IsNull,Box<dynError +Sync +Send>>{`
	`38`	`+ types::inet_to_sql(self.address(),self.network_length(), w);`
	`39`	`+Ok(IsNull::No)`
	`40`	`+}`
	`41`	`+`
	`42`	`+accepts!(INET);`
	`43`	`+to_sql_checked!();`
	`44`	`+}`

Lines changed: 4 additions & 0 deletions

Comments

(0)