Remove yet more failure

Author: sfackler

src/error.rs

@@ -481,21 +481,6 @@ impl PostgresDbError {
             routine: map.pop(&('R' as u8)).unwrap()
         }
     }
-
-    #[doc(hidden)]
-    pub fn pretty_error(&self, query: &str) -> ~str {
-        match self.position {
-            Some(Position(pos)) =>
-                format!("{}: {} at position {} in\n{}", self.severity,
-                        self.message, pos, query),
-            Some(InternalPosition { position, query: ref inner_query }) =>
-                format!("{}: {} at position {} in\n{} called from\n{}",
-                        self.severity, self.message, position, *inner_query,
-                        query),
-            None => format!("{}: {} in\n{}", self.severity, self.message,
-                            query)
-        }
-    }
 }
 
 /// An error encountered when communicating with the Postgres server
@@ -522,4 +507,6 @@ pub enum PostgresError {
     PgWrongType(PostgresType),
     /// An attempt was made to read from a column that does not exist
     PgInvalidColumn,
+    /// A value was NULL but converted to a non-nullable Rust type
+    PgWasNull,
 }

src/test.rs

@@ -23,6 +23,7 @@ use error::{PgConnectDbError,
             PgWrongParamCount,
             PgWrongType,
             PgInvalidColumn,
+            PgWasNull,
             DnsError,
             MissingPassword,
             Position,
@@ -770,6 +771,18 @@ fn test_get_named_err() {
     };
 }
 
+#[test]
+fn test_get_was_null() {
+    let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
+    let stmt = or_fail!(conn.prepare("SELECT NULL::INT as id"));
+    let mut result = or_fail!(stmt.query([]));
+
+    match result.next().unwrap().get::<uint, i32>(1) {
+        Err(PgWasNull) => {}
+        res => fail!("unexpected result {}", res),
+    };
+}
+
 #[test]
 fn test_custom_notice_handler() {
     static mut count: uint = 0;

src/types/mod.rs

@@ -10,7 +10,7 @@ use std::io::util::LimitReader;
 use std::str;
 use time::Timespec;
 
-use error::{PostgresError, PgWrongType, PgStreamError};
+use error::{PostgresError, PgWrongType, PgStreamError, PgWasNull};
 use types::array::{Array, ArrayBase, DimensionInfo};
 use types::range::{RangeBound, Inclusive, Exclusive, Range};
 
@@ -378,7 +378,11 @@ macro_rules! from_map_impl(
                     -> Result<$t, PostgresError> {
                 // FIXME when you can specify Self types properly
                 let ret: Result<Option<$t>, PostgresError> = FromSql::from_sql(ty, raw);
-                ret.map(|ok| ok.unwrap())
+                match ret {
+                    Ok(Some(val)) => Ok(val),
+                    Ok(None) => Err(PgWasNull),
+                    Err(err) => Err(err)
+                }
             }
         }
     )
@@ -501,7 +505,11 @@ impl FromSql for HashMap<~str, Option<~str>> {
                 -> Result<HashMap<~str, Option<~str>>, PostgresError> {
         // FIXME when you can specify Self types properly
         let ret: Result<Option<HashMap<~str, Option<~str>>>, PostgresError> = FromSql::from_sql(ty, raw);
-        ret.map(|ok| ok.unwrap())
+        match ret {
+            Ok(Some(val)) => Ok(val),
+            Ok(None) => Err(PgWasNull),
+            Err(err) => Err(err)
+        }
     }
 }