Merge pull request #158 from abaumhauer/macaddr

Macaddr

Author: sfackler

.travis.yml

@@ -10,4 +10,4 @@ before_script:
 - "./.travis/setup.sh"
 script:
 - cargo test
-- cargo test --features "uuid rustc-serialize time unix_socket serde_json chrono openssl bit-vec"
+- cargo test --features "uuid rustc-serialize time unix_socket serde_json chrono openssl bit-vec eui48"

Cargo.toml

@@ -40,6 +40,7 @@ unix_socket = { version = "0.5", optional = true }
 uuid = { version = "0.1", optional = true }
 security-framework = { version = "0.1.2", optional = true }
 bit-vec = { version = "0.4", optional = true }
+eui48 = { version = "0.1", optional = true }
 
 [dev-dependencies]
 url = "0.5"

README.md

@@ -252,6 +252,13 @@ types. The driver currently supports the following conversions:
             <td>HashMap&lt;String, Option&lt;String&gt;&gt;</td>
             <td>HSTORE</td>
         </tr>
+        <tr>
+            <td>
+                <a href="https://github.com/abaumhauer/eui48">eui48::MacAddress</a>
+                (<a href="#optional-features">optional</a>)
+            </td>
+            <td>MACADDR</td>
+        </tr>
     </tbody>
 </table>
 
@@ -302,3 +309,9 @@ feature, which adds `ToSql` and `FromSql` implementations for `chrono`'s
 [BIT and VARBIT](http://www.postgresql.org/docs/9.4/static/datatype-bit.html)
 support is provided optionally by the `bit-vec` feature, which adds `ToSql` and
 `FromSql` implementations for `bit-vec`'s `BitVec` type.
+
+### MACADDR type
+
+[MACADDR](http://www.postgresql.org/docs/9.4/static/datatype-net-types.html#DATATYPE-MACADDR)
+support is provided optionally by the `eui48` feature, which adds `ToSql` and
+`FromSql` implementations for `eui48`'s `MacAddress` type.

src/types/eui48.rs

@@ -0,0 +1,29 @@
+extern crate eui48;
+
+use std::io::prelude::*;
+
+use self::eui48::MacAddress;
+
+use types::{FromSql, ToSql, Type, IsNull, SessionInfo};
+use Result;
+use util;
+
+impl FromSql for MacAddress {
+    fn from_sql<R: Read>(_: &Type, raw: &mut R, _: &SessionInfo) -> Result<MacAddress> {
+        let mut bytes = [0; 6];
+        try!(util::read_all(raw, &mut bytes));
+        Ok(MacAddress::new(bytes))
+    }
+
+    accepts!(Type::Macaddr);
+}
+
+impl ToSql for MacAddress {
+    fn to_sql<W: Write + ?Sized>(&self, _: &Type, w: &mut W, _: &SessionInfo) -> Result<IsNull> {
+        try!(w.write_all(self.as_bytes()));
+        Ok(IsNull::No)
+    }
+
+    accepts!(Type::Macaddr);
+    to_sql_checked!();
+}

src/types/mod.rs

@@ -67,6 +67,8 @@ mod rustc_serialize;
 mod serde_json;
 #[cfg(feature = "chrono")]
 mod chrono;
+#[cfg(feature = "eui48")]
+mod eui48;
 
 /// A structure providing information for conversion methods.
 pub struct SessionInfo<'a> {
@@ -658,6 +660,7 @@ impl WrongTypeNew for WrongType {
 /// | chrono::DateTime&lt;FixedOffset&gt; | TIMESTAMP WITH TIME ZONE            |
 /// | chrono::NaiveDate                   | DATE                                |
 /// | chrono::NaiveTime                   | TIME                                |
+/// | eui48::MacAddress                   | MACADDR                             |
 /// | uuid::Uuid                          | UUID                                |
 /// | bit_vec::BitVec                     | BIT, VARBIT                         |
 ///

tests/types/eui48.rs

@@ -0,0 +1,9 @@
+extern crate eui48;
+
+use types::test_type;
+
+#[test]
+fn test_eui48_params() {
+    test_type("MACADDR", &[(Some(eui48::MacAddress::parse_str("12-34-56-AB-CD-EF").unwrap()),
+        "'12-34-56-ab-cd-ef'"), (None, "NULL")])
+}