Fix wrong type names in error messages

Author: pka

src/ewkb.rs

@@ -523,7 +523,7 @@ macro_rules! point_container_write {
                   I: 'a + Iterator<Item=&'a T> + ExactSizeIterator<Item=&'a T>
         {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                write!(f, "$ewkbtype")?; //TODO
+                write!(f, stringify!($ewkbtype))?; //TODO
                 Ok(())
             }
         }
@@ -591,7 +591,7 @@ macro_rules! geometry_container_write {
                   J: 'a + Iterator<Item=&'a T> + ExactSizeIterator<Item=&'a T>
         {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                write!(f, "$ewkbtype")?; //TODO
+                write!(f, stringify!($ewkbtype))?; //TODO
                 Ok(())
             }
         }
@@ -665,7 +665,7 @@ macro_rules! geometry_container_write {
                   J: 'a + Iterator<Item=&'a T> + ExactSizeIterator<Item=&'a T>
         {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                write!(f, "$ewkbtype")?; //TODO
+                write!(f, stringify!($ewkbtype))?; //TODO
                 Ok(())
             }
         }

src/postgis.rs

@@ -38,7 +38,7 @@ macro_rules! impl_sql_for_point_type {
             accepts_geography!();
             fn from_sql(ty: &Type, raw: &[u8], _ctx: &SessionInfo) -> Result<Self, Box<Error + Sync + Send>> {
                 let mut rdr = Cursor::new(raw);
-                ewkb::$ptype::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to POINT", ty).into())
+                ewkb::$ptype::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to {}", ty, stringify!($ptype)).into())
             }
         }
 
@@ -67,7 +67,7 @@ macro_rules! impl_sql_for_geom_type {
             accepts_geography!();
             fn from_sql(ty: &Type, raw: &[u8], _ctx: &SessionInfo) -> Result<Self, Box<Error + Sync + Send>> {
                 let mut rdr = Cursor::new(raw);
-                ewkb::$geotype::<T>::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to LINESTRING", ty).into())
+                ewkb::$geotype::<T>::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to {}", ty, stringify!($geotype)).into())
             }
         }
 
@@ -152,7 +152,7 @@ impl<P> FromSql for ewkb::GeometryT<P>
     accepts_geography!();
     fn from_sql(ty: &Type, raw: &[u8], _ctx: &SessionInfo) -> Result<Self, Box<Error + Sync + Send>> {
         let mut rdr = Cursor::new(raw);
-        ewkb::GeometryT::<P>::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to MultiPoint", ty).into())
+        ewkb::GeometryT::<P>::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to {}", ty, stringify!(P)).into())
     }
 }
 
@@ -162,7 +162,7 @@ impl<P> FromSql for ewkb::GeometryCollectionT<P>
     accepts_geography!();
     fn from_sql(ty: &Type, raw: &[u8], _ctx: &SessionInfo) -> Result<Self, Box<Error + Sync + Send>> {
         let mut rdr = Cursor::new(raw);
-        ewkb::GeometryCollectionT::<P>::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to MultiPoint", ty).into())
+        ewkb::GeometryCollectionT::<P>::read_ewkb(&mut rdr).map_err(|_| format!("cannot convert {} to {}", ty, stringify!(P)).into())
     }
 }
 
@@ -486,6 +486,15 @@ mod tests {
         assert_eq!(format!("{:?}", geom), "Point(PointZ { x: 10, y: -20, z: 99, srid: Some(4326) })");
     }
 
+    #[test]
+    #[ignore]
+    fn test_select_type_error() {
+        let conn = connect();
+        let result = or_panic!(conn.query("SELECT ('LINESTRING (10 -20, -0 -0.5)')::geometry", &[]));
+        let poly = result.iter().map(|r| r.get_opt::<_, ewkb::Polygon>(0)).last().unwrap();
+        assert_eq!(format!("{:?}", poly), "Some(Err(Conversion(StringError(\"cannot convert geometry to PolygonT\"))))");
+    }
+
     #[test]
     #[ignore]
     fn test_twkb() {

src/twkb.rs

@@ -590,23 +590,23 @@ fn test_write_point() {
 fn test_write_line() {
     let twkb = hex_to_vec("220002c8018f03c7018603"); // SELECT encode(ST_AsTWKB('LINESTRING (10 -20, -0 -0.5)'::geometry, 1), 'hex')
     let line = LineString::read_twkb(&mut twkb.as_slice()).unwrap();
-    assert_eq!(format!("{:?}", line.as_ewkb()), "$ewkbtype");
+    assert_eq!(format!("{:?}", line.as_ewkb()), "EwkbLineString");
     assert_eq!(line.as_ewkb().to_hex_ewkb(), "010200000002000000000000000000244000000000000034C00000000000000000000000000000E0BF");
 }
 
 #[test]
 fn test_write_polygon() {
     let twkb = hex_to_vec("03000205000004000004030000030514141700001718000018"); // SELECT encode(ST_AsTWKB('POLYGON ((0 0, 2 0, 2 2, 0 2, 0 0),(10 10, -2 10, -2 -2, 10 -2, 10 10))'::geometry), 'hex')
     let polygon = Polygon::read_twkb(&mut twkb.as_slice()).unwrap();
-    assert_eq!(format!("{:?}", polygon.as_ewkb()), "$ewkbtype");
+    assert_eq!(format!("{:?}", polygon.as_ewkb()), "EwkbPolygon");
     assert_eq!(polygon.as_ewkb().to_hex_ewkb(), "010300000002000000050000000000000000000000000000000000000000000000000000400000000000000000000000000000004000000000000000400000000000000000000000000000004000000000000000000000000000000000050000000000000000002440000000000000244000000000000000C0000000000000244000000000000000C000000000000000C0000000000000244000000000000000C000000000000024400000000000002440");
 }
 
 #[test]
 fn test_write_multipoint() {
     let twkb = hex_to_vec("04000214271326"); // SELECT encode(ST_AsTWKB('MULTIPOINT ((10 -20), (0 -0.5))'::geometry), 'hex')
     let multipoint = MultiPoint::read_twkb(&mut twkb.as_slice()).unwrap();
-    assert_eq!(format!("{:?}", multipoint.as_ewkb()), "$ewkbtype");
+    assert_eq!(format!("{:?}", multipoint.as_ewkb()), "EwkbMultiPoint");
     //assert_eq!(multipoint.as_ewkb().to_hex_ewkb(), "0104000000020000000101000000000000000000244000000000000034C001010000000000000000000000000000000000E0BF");
     // "MULTIPOINT(10 -20,0 -1)"
     assert_eq!(multipoint.as_ewkb().to_hex_ewkb(), "0104000000020000000101000000000000000000244000000000000034C001010000000000000000000000000000000000F0BF");
@@ -616,7 +616,7 @@ fn test_write_multipoint() {
 fn test_write_multiline() {
     let twkb = hex_to_vec("05000202142713260200020400"); // SELECT encode(ST_AsTWKB('MULTILINESTRING ((10 -20, 0 -0.5), (0 0, 2 0))'::geometry), 'hex')
     let multiline = MultiLineString::read_twkb(&mut twkb.as_slice()).unwrap();
-    assert_eq!(format!("{:?}", multiline.as_ewkb()), "$ewkbtype");
+    assert_eq!(format!("{:?}", multiline.as_ewkb()), "EwkbMultiLineString");
     //assert_eq!(multiline.as_ewkb().to_hex_ewkb(), "010500000002000000010200000002000000000000000000244000000000000034C00000000000000000000000000000E0BF0102000000020000000000000000000000000000000000000000000000000000400000000000000000");
     // "MULTILINESTRING((10 -20,0 -1),(0 0,2 0))"
     assert_eq!(multiline.as_ewkb().to_hex_ewkb(), "010500000002000000010200000002000000000000000000244000000000000034C00000000000000000000000000000F0BF0102000000020000000000000000000000000000000000000000000000000000400000000000000000");
@@ -626,6 +626,6 @@ fn test_write_multiline() {
 fn test_write_multipoly() {
     let twkb = hex_to_vec("060002010500000400000403000003010514141700001718000018"); // SELECT encode(ST_AsTWKB('MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((10 10, -2 10, -2 -2, 10 -2, 10 10)))'::geometry), 'hex')
     let multipoly = MultiPolygon::read_twkb(&mut twkb.as_slice()).unwrap();
-    assert_eq!(format!("{:?}", multipoly.as_ewkb()), "$ewkbtype");
+    assert_eq!(format!("{:?}", multipoly.as_ewkb()), "EwkbMultiPolygon");
     assert_eq!(multipoly.as_ewkb().to_hex_ewkb(), "010600000002000000010300000001000000050000000000000000000000000000000000000000000000000000400000000000000000000000000000004000000000000000400000000000000000000000000000004000000000000000000000000000000000010300000001000000050000000000000000002440000000000000244000000000000000C0000000000000244000000000000000C000000000000000C0000000000000244000000000000000C000000000000024400000000000002440");
 }