From 4497035fe1d2ced66c6767024e545c6717c87d5e Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 17 Aug 2013 23:30:31 -0400
Subject: [PATCH] Remove configurable notice handler

---
 src/postgres/lib.rs  | 50 ++++++++++++++++----------------------------
 src/postgres/test.rs | 16 ++++++++++++++
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/postgres/lib.rs b/src/postgres/lib.rs
index 9dc1524f..3ae8a459 100644
--- a/src/postgres/lib.rs
+++ b/src/postgres/lib.rs
@@ -3,7 +3,6 @@ use std::c_str::{ToCStr, CString};
 use std::str;
 use std::ptr;
 use std::libc::{c_void, c_char, c_int};
-use std::cast;
 use std::iterator::RandomAccessIterator;
 use std::vec;
 
@@ -55,55 +54,46 @@ mod ffi {
     }
 }
 
-pub struct PostgresConnection<'self> {
+pub struct PostgresConnection {
     priv conn: *ffi::PGconn,
     priv next_stmt_id: Cell<uint>,
-    priv notice_handler: &'self fn(~str)
 }
 
-pub fn log_notice_handler(notice: ~str) {
-    if notice.starts_with("DEBUG") {
-        debug!("%s", notice);
-    } else if notice.starts_with("NOTICE") ||
-            notice.starts_with("INFO") ||
-            notice.starts_with("LOG") {
-        info!("%s", notice);
-    } else if notice.starts_with("WARNING") {
-        warn!("%s", notice);
+extern "C" fn notice_handler(_arg: *c_void, message: *c_char) {
+    let message = unsafe { str::raw::from_c_str(message) };
+    if message.starts_with("DEBUG") {
+        debug!("%s", message);
+    } else if message.starts_with("NOTICE") ||
+            message.starts_with("INFO") ||
+            message.starts_with("LOG") {
+        info!("%s", message);
+    } else if message.starts_with("WARNING") {
+        warn!("%s", message);
     } else {
-        error!("%s", notice);
-    }
-}
-
-extern "C" fn notice_handler(arg: *c_void, message: *c_char) {
-    unsafe {
-        let conn: *PostgresConnection = cast::transmute(arg);
-        ((*conn).notice_handler)(str::raw::from_c_str(message));
+        error!("%s", message);
     }
 }
 
 #[unsafe_destructor]
-impl<'self> Drop for PostgresConnection<'self> {
+impl Drop for PostgresConnection {
     fn drop(&self) {
         unsafe { ffi::PQfinish(self.conn) }
     }
 }
 
-impl<'self> PostgresConnection<'self> {
+impl PostgresConnection {
     fn get_error(&self) -> ~str {
         unsafe { str::raw::from_c_str(ffi::PQerrorMessage(self.conn)) }
     }
 }
 
-impl<'self> PostgresConnection<'self> {
+impl PostgresConnection {
     pub fn new(uri: &str) -> Result<~PostgresConnection, ~str> {
         unsafe {
             let conn = ~PostgresConnection {conn: do uri.with_c_str |c_uri| {
                 ffi::PQconnectdb(c_uri)
-            }, next_stmt_id: Cell::new(0), notice_handler: log_notice_handler};
-            let arg: *PostgresConnection = &*conn;
-            ffi::PQsetNoticeProcessor(conn.conn, notice_handler,
-                                      arg as *c_void);
+            }, next_stmt_id: Cell::new(0)};
+            ffi::PQsetNoticeProcessor(conn.conn, notice_handler, ptr::null());
 
             match ffi::PQstatus(conn.conn) {
                 ffi::CONNECTION_OK => Ok(conn),
@@ -112,10 +102,6 @@ impl<'self> PostgresConnection<'self> {
         }
     }
 
-    pub fn set_notice_handler(&mut self, handler: &'self fn(~str)) {
-        self.notice_handler = handler;
-    }
-
     pub fn prepare<'a>(&'a self, query: &str)
                        -> Result<~PostgresStatement<'a>, ~str> {
         let id = self.next_stmt_id.take();
@@ -188,7 +174,7 @@ impl<'self> PostgresConnection<'self> {
 }
 
 pub struct PostgresStatement<'self> {
-    priv conn: &'self PostgresConnection<'self>,
+    priv conn: &'self PostgresConnection,
     priv name: ~str,
     priv num_params: uint
 }
diff --git a/src/postgres/test.rs b/src/postgres/test.rs
index 65f2a6a6..34779a71 100644
--- a/src/postgres/test.rs
+++ b/src/postgres/test.rs
@@ -37,6 +37,22 @@ fn test_basic() {
     };
 }
 
+#[test]
+fn test_multiple_stmts() {
+    let conn = chk!(PostgresConnection::new("postgres://postgres@localhost"));
+
+    do conn.in_transaction |conn| {
+        chk!(conn.update("CREATE TABLE foo (id INT PRIMARY KEY)", []));
+        let stmt1 = chk!(conn.prepare("INSERT INTO foo (id) VALUES (101)"));
+        let stmt2 = chk!(conn.prepare("INSERT INTO foo (id) VALUES (102)"));
+
+        chk!(stmt1.update([]));
+        chk!(stmt2.update([]));
+
+        Err::<(), ~str>(~"")
+    };
+}
+
 #[test]
 fn test_params() {
 	let conn = chk!(PostgresConnection::new("postgres://postgres@localhost"));