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

PostgresNotification -> Notification

Browse Source
This commit is contained in:
Steven Fackler 2014-11-01 16:18:09 -07:00
parent c6c7d8f574
commit 570512725f
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib.rs
View File

@ -271,7 +271,7 @@ impl NoticeHandler for DefaultNoticeHandler {
}
/// An asynchronous notification
pub struct PostgresNotification {
pub struct Notification {
/// The process ID of the notifying backend process
pub pid: u32,
/// The name of the channel that the notify has been raised on
@ -281,18 +281,18 @@ pub struct PostgresNotification {
}
/// An iterator over asynchronous notifications
pub struct PostgresNotifications<'conn> {
pub struct Notifications<'conn> {
conn: &'conn PostgresConnection
}
impl<'conn> Iterator<PostgresNotification> for PostgresNotifications<'conn> {
impl<'conn> Iterator<Notification> for Notifications<'conn> {
/// Returns the oldest pending notification or `None` if there are none.
///
/// ## Note
///
/// `next` may return `Some` notification after returning `None` if a new
/// notification was received.
fn next(&mut self) -> Option<PostgresNotification> {
fn next(&mut self) -> Option<Notification> {
self.conn.conn.borrow_mut().notifications.pop_front()
}
}
@ -350,7 +350,7 @@ struct InnerPostgresConnection {
stream: BufferedStream<MaybeSslStream<InternalStream>>,
next_stmt_id: uint,
notice_handler: Box<NoticeHandler+Send>,
notifications: RingBuf<PostgresNotification>,
notifications: RingBuf<Notification>,
cancel_data: PostgresCancelData,
unknown_types: HashMap<Oid, String>,
desynchronized: bool,
@ -448,7 +448,7 @@ impl InnerPostgresConnection {
}
}
NotificationResponse { pid, channel, payload } => {
self.notifications.push(PostgresNotification {
self.notifications.push(Notification {
pid: pid,
channel: channel,
payload: payload
@ -778,8 +778,8 @@ impl PostgresConnection {
/// Returns an iterator over asynchronous notification messages.
///
/// Use the `LISTEN` command to register this connection for notifications.
pub fn notifications<'a>(&'a self) -> PostgresNotifications<'a> {
PostgresNotifications { conn: self }
pub fn notifications<'a>(&'a self) -> Notifications<'a> {
Notifications { conn: self }
}
/// Creates a new prepared statement.

14
tests/test.rs
View File

@ -12,7 +12,7 @@ use std::io::timer;
use std::time::Duration;
use postgres::{NoticeHandler,
PostgresNotification,
Notification,
PostgresConnection,
GenericConnection,
ResultDescription,
@ -570,10 +570,10 @@ fn test_notification_iterator_none() {
#[test]
fn test_notification_iterator_some() {
fn check_notification(expected: PostgresNotification,
actual: Option<PostgresNotification>) {
fn check_notification(expected: Notification,
actual: Option<Notification>) {
match actual {
Some(PostgresNotification { channel, payload, .. }) => {
Some(Notification { channel, payload, .. }) => {
assert_eq!(&expected.channel, &channel);
assert_eq!(&expected.payload, &payload);
}
@ -588,12 +588,12 @@ fn test_notification_iterator_some() {
or_panic!(conn.execute("NOTIFY test_notification_iterator_one_channel, 'hello'", []));
or_panic!(conn.execute("NOTIFY test_notification_iterator_one_channel2, 'world'", []));
check_notification(PostgresNotification {
check_notification(Notification {
pid: 0,
channel: "test_notification_iterator_one_channel".to_string(),
payload: "hello".to_string()
}, it.next());
check_notification(PostgresNotification {
check_notification(Notification {
pid: 0,
channel: "test_notification_iterator_one_channel2".to_string(),
payload: "world".to_string()
@ -601,7 +601,7 @@ fn test_notification_iterator_some() {
assert!(it.next().is_none());
or_panic!(conn.execute("NOTIFY test_notification_iterator_one_channel, '!'", []));
check_notification(PostgresNotification {
check_notification(Notification {
pid: 0,
channel: "test_notification_iterator_one_channel".to_string(),
payload: "!".to_string()