Always silence notices on PG

I don't care that my `CASCADE` query did in fact cascade to things, and
I certainly don't want it printing to stderr ever.

Author: sgrif

diesel/src/connection/mod.rs

@@ -150,8 +150,6 @@ pub trait Connection: SimpleConnection + Sized + Send {
     where
         T: QueryFragment<Self::Backend> + QueryId;
 
-    #[doc(hidden)]
-    fn silence_notices<F: FnOnce() -> T, T>(&self, f: F) -> T;
     #[doc(hidden)]
     fn transaction_manager(&self) -> &Self::TransactionManager;
 }

diesel/src/migrations/mod.rs

@@ -235,14 +235,12 @@ pub fn setup_database<Conn: Connection>(conn: &Conn) -> QueryResult<usize> {
 }
 
 fn create_schema_migrations_table_if_needed<Conn: Connection>(conn: &Conn) -> QueryResult<usize> {
-    conn.silence_notices(|| {
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS __diesel_schema_migrations (
-            version VARCHAR(50) PRIMARY KEY NOT NULL,
-            run_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
-        )",
-        )
-    })
+    conn.execute(
+        "CREATE TABLE IF NOT EXISTS __diesel_schema_migrations (\
+         version VARCHAR(50) PRIMARY KEY NOT NULL,\
+         run_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP\
+         )",
+    )
 }
 
 #[doc(hidden)]

diesel/src/mysql/connection/mod.rs

@@ -80,11 +80,6 @@ impl Connection for MysqlConnection {
         })
     }
 
-    #[doc(hidden)]
-    fn silence_notices<F: FnOnce() -> T, T>(&self, f: F) -> T {
-        f()
-    }
-
     #[doc(hidden)]
     fn execute_returning_count<T>(&self, source: &T) -> QueryResult<usize>
     where

diesel/src/pg/connection/mod.rs

@@ -5,7 +5,7 @@ mod row;
 pub mod result;
 mod stmt;
 
-use std::ffi::{CStr, CString};
+use std::ffi::CString;
 use std::os::raw as libc;
 
 use connection::*;
@@ -88,16 +88,6 @@ impl Connection for PgConnection {
             .map(|r| r.rows_affected())
     }
 
-    #[doc(hidden)]
-    fn silence_notices<F: FnOnce() -> T, T>(&self, f: F) -> T {
-        self.raw_connection
-            .set_notice_processor(noop_notice_processor);
-        let result = f();
-        self.raw_connection
-            .set_notice_processor(default_notice_processor);
-        result
-    }
-
     #[doc(hidden)]
     fn transaction_manager(&self) -> &Self::TransactionManager {
         &self.transaction_manager
@@ -142,20 +132,14 @@ impl PgConnection {
     fn set_config_options(&self) -> QueryResult<()> {
         self.execute("SET TIME ZONE 'UTC'")?;
         self.execute("SET CLIENT_ENCODING TO 'UTF8'")?;
+        self.raw_connection
+            .set_notice_processor(noop_notice_processor);
         Ok(())
     }
 }
 
 extern "C" fn noop_notice_processor(_: *mut libc::c_void, _message: *const libc::c_char) {}
 
-extern "C" fn default_notice_processor(_: *mut libc::c_void, message: *const libc::c_char) {
-    use std::io::Write;
-    let c_str = unsafe { CStr::from_ptr(message) };
-    ::std::io::stderr()
-        .write_all(c_str.to_bytes())
-        .expect("Error writing to `stderr`");
-}
-
 #[cfg(test)]
 mod tests {
     extern crate dotenv;

diesel/src/sqlite/connection/mod.rs

@@ -85,11 +85,6 @@ impl Connection for SqliteConnection {
         Ok(self.raw_connection.rows_affected_by_last_query())
     }
 
-    #[doc(hidden)]
-    fn silence_notices<F: FnOnce() -> T, T>(&self, f: F) -> T {
-        f()
-    }
-
     #[doc(hidden)]
     fn transaction_manager(&self) -> &Self::TransactionManager {
         &self.transaction_manager

diesel_cli/tests/support/postgres_database.rs

@@ -61,11 +61,9 @@ impl Drop for Database {
             PgConnection::establish(&postgres_url),
             "Couldn't connect to database"
         );
-        conn.silence_notices(|| {
-            try_drop!(
-                conn.execute(&format!(r#"DROP DATABASE IF EXISTS "{}""#, database)),
-                "Couldn't drop database"
-            );
-        });
+        try_drop!(
+            conn.execute(&format!(r#"DROP DATABASE IF EXISTS "{}""#, database)),
+            "Couldn't drop database"
+        );
     }
 }