Support INT2[]

Author: sfackler

README.md

@@ -270,6 +270,10 @@ types. The driver currently supports the following conversions:
             <td>types::array::ArrayBase&lt;Option&lt;i8&gt;&gt;</td>
             <td>"char"[], "char"[][], ...</td>
         </tr>
+        <tr>
+            <td>types::array::ArrayBase&lt;Option&lt;i16&gt;&gt;</td>
+            <td>INT2[], INT2[][], ...</td>
+        </tr>
         <tr>
             <td>types::array::ArrayBase&lt;Option&lt;i32&gt;&gt;</td>
             <td>INT4[], INT4[][], ...</td>

test.rs

@@ -433,40 +433,45 @@ macro_rules! test_array_params(
 )
 
 #[test]
-fn test_int4array_params() {
-    test_array_params!("INT4", 0i32, "0", 1i32, "1", 2i32, "2");
+fn test_boolarray_params() {
+    test_array_params!("BOOL", false, "f", true, "t", true, "t");
 }
 
 #[test]
-fn test_int8array_params() {
-    test_array_params!("INT8", 0i64, "0", 1i64, "1", 2i64, "2");
+fn test_byteaarray_params() {
+    test_array_params!("BYTEA", ~[0u8, 1], r#""\\x0001""#, ~[254u8, 255u8],
+                       r#""\\xfeff""#, ~[10u8, 11u8], r#""\\x0a0b""#);
 }
 
 #[test]
-fn test_float4array_params() {
-    test_array_params!("FLOAT4", 0f32, "0", 1.5f32, "1.5", 0.009f32, ".009");
+fn test_chararray_params() {
+    test_array_params!("\"char\"", 'a' as i8, "a", 'z' as i8, "z",
+                       '0' as i8, "0");
 }
 
 #[test]
-fn test_float8array_params() {
-    test_array_params!("FLOAT8", 0f64, "0", 1.5f64, "1.5", 0.009f64, ".009");
+fn test_int2array_params() {
+    test_array_params!("INT2", 0i16, "0", 1i16, "1", 2i16, "2");
 }
 
 #[test]
-fn test_boolarray_params() {
-    test_array_params!("BOOL", false, "f", true, "t", true, "t");
+fn test_int4array_params() {
+    test_array_params!("INT4", 0i32, "0", 1i32, "1", 2i32, "2");
 }
 
 #[test]
-fn test_byteaarray_params() {
-    test_array_params!("BYTEA", ~[0u8, 1], r#""\\x0001""#, ~[254u8, 255u8],
-                       r#""\\xfeff""#, ~[10u8, 11u8], r#""\\x0a0b""#);
+fn test_int8array_params() {
+    test_array_params!("INT8", 0i64, "0", 1i64, "1", 2i64, "2");
 }
 
 #[test]
-fn test_chararray_params() {
-    test_array_params!("\"char\"", 'a' as i8, "a", 'z' as i8, "z",
-                       '0' as i8, "0");
+fn test_float4array_params() {
+    test_array_params!("FLOAT4", 0f32, "0", 1.5f32, "1.5", 0.009f32, ".009");
+}
+
+#[test]
+fn test_float8array_params() {
+    test_array_params!("FLOAT8", 0f64, "0", 1.5f64, "1.5", 0.009f64, ".009");
 }
 
 #[test]

types/mod.rs

@@ -36,6 +36,7 @@ static FLOAT8OID: Oid = 701;
 static BOOLARRAYOID: Oid = 1000;
 static BYTEAARRAYOID: Oid = 1001;
 static CHARARRAYOID: Oid = 1002;
+static INT2ARRAYOID: Oid = 1005;
 static INT4ARRAYOID: Oid = 1007;
 static INT8ARRAYOID: Oid = 1016;
 static FLOAT4ARRAYOID: Oid = 1021;
@@ -91,6 +92,8 @@ pub enum PostgresType {
     PgByteAArray,
     /// "char"[]
     PgCharArray,
+    /// INT2[]
+    PgInt2Array,
     /// INT4[]
     PgInt4Array,
     /// INT8[]
@@ -143,6 +146,7 @@ impl PostgresType {
             BOOLARRAYOID => PgBoolArray,
             BYTEAARRAYOID => PgByteAArray,
             CHARARRAYOID => PgCharArray,
+            INT2ARRAYOID => PgInt2Array,
             INT4ARRAYOID => PgInt4Array,
             INT8ARRAYOID => PgInt8Array,
             FLOAT4ARRAYOID => PgFloat4Array,
@@ -227,6 +231,7 @@ impl RawFromSql for ~[u8] {
 }
 
 raw_from_impl!(i8, read_i8)
+raw_from_impl!(i16, read_be_i16)
 raw_from_impl!(i32, read_be_i32)
 raw_from_impl!(i64, read_be_i64)
 raw_from_impl!(f32, read_be_f32)
@@ -267,15 +272,6 @@ macro_rules! from_raw_from_impl(
     )
 )
 
-macro_rules! from_conversions_impl(
-    ($expected:pat, $t:ty, $f:ident) => (
-        from_map_impl!($expected, $t, |buf| {
-            let mut reader = BufReader::new(buf.as_slice());
-            reader.$f()
-        })
-    )
-)
-
 macro_rules! from_option_impl(
     ($t:ty) => (
         impl FromSql for $t {
@@ -294,6 +290,8 @@ from_raw_from_impl!(PgByteA, ~[u8])
 from_option_impl!(~[u8])
 from_raw_from_impl!(PgChar, i8)
 from_option_impl!(i8)
+from_raw_from_impl!(PgInt2, i16)
+from_option_impl!(i16)
 from_raw_from_impl!(PgInt4, i32)
 from_option_impl!(i32)
 from_raw_from_impl!(PgInt8, i64)
@@ -303,9 +301,6 @@ from_option_impl!(f32)
 from_raw_from_impl!(PgFloat8, f64)
 from_option_impl!(f64)
 
-from_conversions_impl!(PgInt2, i16, read_be_i16)
-from_option_impl!(i16)
-
 from_map_impl!(PgVarchar | PgText | PgCharN, ~str, |buf| {
     str::from_utf8_owned(buf.clone())
 })
@@ -416,6 +411,9 @@ from_option_impl!(ArrayBase<Option<~[u8]>>)
 from_array_impl!(PgCharArray, i8)
 from_option_impl!(ArrayBase<Option<i8>>)
 
+from_array_impl!(PgInt2Array, i16)
+from_option_impl!(ArrayBase<Option<i16>>)
+
 from_array_impl!(PgInt4Array, i32)
 from_option_impl!(ArrayBase<Option<i32>>)
 
@@ -506,6 +504,7 @@ impl RawToSql for ~[u8] {
 }
 
 raw_to_impl!(i8, write_i8)
+raw_to_impl!(i16, write_be_i16)
 raw_to_impl!(i32, write_be_i32)
 raw_to_impl!(i64, write_be_i64)
 raw_to_impl!(f32, write_be_f32)
@@ -567,26 +566,14 @@ macro_rules! to_raw_to_impl(
     )
 )
 
-macro_rules! to_conversions_impl(
-    ($($oid:ident)|+, $t:ty, $f:ident) => (
-        impl ToSql for $t {
-            fn to_sql(&self, ty: &PostgresType) -> (Format, Option<~[u8]>) {
-                check_types!($($oid)|+, ty)
-
-                let mut writer = MemWriter::new();
-                writer.$f(*self);
-                (Binary, Some(writer.inner()))
-            }
-        }
-    )
-)
-
 to_raw_to_impl!(PgBool, bool)
 to_option_impl!(PgBool, bool)
 to_raw_to_impl!(PgByteA, ~[u8])
 to_option_impl!(PgByteA, ~[u8])
 to_raw_to_impl!(PgChar, i8)
 to_option_impl!(PgChar, i8)
+to_raw_to_impl!(PgInt2, i16)
+to_option_impl!(PgInt2, i16)
 to_raw_to_impl!(PgInt4, i32)
 to_option_impl!(PgInt4, i32)
 to_raw_to_impl!(PgInt8, i64)
@@ -596,9 +583,6 @@ to_option_impl!(PgFloat4, f32)
 to_raw_to_impl!(PgFloat8, f64)
 to_option_impl!(PgFloat8, f64)
 
-to_conversions_impl!(PgInt2, i16, write_be_i16)
-to_option_impl!(PgInt2, i16)
-
 impl ToSql for ~str {
     fn to_sql(&self, ty: &PostgresType) -> (Format, Option<~[u8]>) {
         check_types!(PgVarchar | PgText | PgCharN, ty)
@@ -744,6 +728,9 @@ to_option_impl!(PgByteAArray, ArrayBase<Option<~[u8]>>)
 to_array_impl!(PgCharArray, CHAROID, i8)
 to_option_impl!(PgCharArray, ArrayBase<Option<i8>>)
 
+to_array_impl!(PgInt2Array, INT2OID, i16)
+to_option_impl!(PgInt2Array, ArrayBase<Option<i16>>)
+
 to_array_impl!(PgInt4Array, INT4OID, i32)
 to_option_impl!(PgInt4Array, ArrayBase<Option<i32>>)