dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PostgresNoticeHandler -> NoticeHandler

Browse Source
This commit is contained in:
Steven Fackler 2014-11-01 16:16:50 -07:00
parent 975b6dc350
commit c6c7d8f574
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib.rs
View File

@ -254,7 +254,7 @@ impl IntoConnectParams for Url {
} }
/// Trait for types that can handle Postgres notice messages /// Trait for types that can handle Postgres notice messages
pub trait PostgresNoticeHandler { pub trait NoticeHandler {
/// Handle a Postgres notice message /// Handle a Postgres notice message
fn handle(&mut self, notice: PostgresDbError); fn handle(&mut self, notice: PostgresDbError);
} }
@ -264,7 +264,7 @@ pub trait PostgresNoticeHandler {
/// This is the default handler used by a `PostgresConnection`. /// This is the default handler used by a `PostgresConnection`.
pub struct DefaultNoticeHandler; pub struct DefaultNoticeHandler;
impl PostgresNoticeHandler for DefaultNoticeHandler { impl NoticeHandler for DefaultNoticeHandler {
fn handle(&mut self, notice: PostgresDbError) { fn handle(&mut self, notice: PostgresDbError) {
info!("{}: {}", notice.severity, notice.message); info!("{}: {}", notice.severity, notice.message);
} }
@ -349,7 +349,7 @@ pub fn cancel_query<T>(params: T, ssl: &SslMode, data: PostgresCancelData)
struct InnerPostgresConnection { struct InnerPostgresConnection {
stream: BufferedStream<MaybeSslStream<InternalStream>>, stream: BufferedStream<MaybeSslStream<InternalStream>>,
next_stmt_id: uint, next_stmt_id: uint,
notice_handler: Box<PostgresNoticeHandler+Send>, notice_handler: Box<NoticeHandler+Send>,
notifications: RingBuf<PostgresNotification>, notifications: RingBuf<PostgresNotification>,
cancel_data: PostgresCancelData, cancel_data: PostgresCancelData,
unknown_types: HashMap<Oid, String>, unknown_types: HashMap<Oid, String>,
@ -507,8 +507,8 @@ impl InnerPostgresConnection {
} }
} }
fn set_notice_handler(&mut self, handler: Box<PostgresNoticeHandler+Send>) fn set_notice_handler(&mut self, handler: Box<NoticeHandler+Send>)
-> Box<PostgresNoticeHandler+Send> { -> Box<NoticeHandler+Send> {
mem::replace(&mut self.notice_handler, handler) mem::replace(&mut self.notice_handler, handler)
} }
@ -771,8 +771,7 @@ impl PostgresConnection {
} }
/// Sets the notice handler for the connection, returning the old handler. /// Sets the notice handler for the connection, returning the old handler.
pub fn set_notice_handler(&self, handler: Box<PostgresNoticeHandler+Send>) pub fn set_notice_handler(&self, handler: Box<NoticeHandler+Send>) -> Box<NoticeHandler+Send> {
-> Box<PostgresNoticeHandler+Send> {
self.conn.borrow_mut().set_notice_handler(handler) self.conn.borrow_mut().set_notice_handler(handler)
} }

4
tests/test.rs
View File

@ -11,7 +11,7 @@ use openssl::ssl::{SslContext, Sslv3};
use std::io::timer; use std::io::timer;
use std::time::Duration; use std::time::Duration;
use postgres::{PostgresNoticeHandler, use postgres::{NoticeHandler,
PostgresNotification, PostgresNotification,
PostgresConnection, PostgresConnection,
GenericConnection, GenericConnection,
@ -542,7 +542,7 @@ fn test_custom_notice_handler() {
static mut count: uint = 0; static mut count: uint = 0;
struct Handler; struct Handler;
impl PostgresNoticeHandler for Handler { impl NoticeHandler for Handler {
fn handle(&mut self, notice: PostgresDbError) { fn handle(&mut self, notice: PostgresDbError) {
assert_eq!("note", notice.message[]); assert_eq!("note", notice.message[]);
unsafe { count += 1; } unsafe { count += 1; }