diff --git a/pgmq-rs/Cargo.toml b/pgmq-rs/Cargo.toml index b5487a5b..a6846347 100644 --- a/pgmq-rs/Cargo.toml +++ b/pgmq-rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgmq" -version = "0.28.0" +version = "0.28.1" edition = "2021" authors = ["Tembo.io"] description = "A distributed message queue for Rust applications, on Postgres." diff --git a/pgmq-rs/src/lib.rs b/pgmq-rs/src/lib.rs index 1e249524..a392990f 100644 --- a/pgmq-rs/src/lib.rs +++ b/pgmq-rs/src/lib.rs @@ -56,7 +56,7 @@ //! ## Minimal example at a glance //! //! ```rust -//! use pgmq::{PgmqError, types::Message, PGMQueue}; +//! use pgmq::{PgmqError, Message, PGMQueue}; //! use serde::{Deserialize, Serialize}; //! use serde_json::Value; //! @@ -162,6 +162,7 @@ mod query; pub use errors::PgmqError; pub use pg_ext::PGMQueueExt; +pub use types::Message; use std::time::Duration; @@ -473,7 +474,7 @@ impl PGMQueue { /// Example: /// /// ```rust - /// use pgmq::{types::Message, PgmqError, PGMQueue}; + /// use pgmq::{Message, PgmqError, PGMQueue}; /// use serde::{Deserialize, Serialize}; /// use serde_json::Value; /// @@ -522,7 +523,7 @@ impl PGMQueue { &self, queue_name: &str, vt: Option, - ) -> Result>, PgmqError> { + ) -> Result>, PgmqError> { // map vt or default VT let vt_ = match vt { Some(t) => t, @@ -551,7 +552,7 @@ impl PGMQueue { /// Example: /// /// ```rust - /// use pgmq::{types::Message, PgmqError, PGMQueue}; + /// use pgmq::{Message, PgmqError, PGMQueue}; /// use serde::{Deserialize, Serialize}; /// use serde_json::Value; /// @@ -604,7 +605,7 @@ impl PGMQueue { queue_name: &str, vt: Option, num_msgs: i32, - ) -> Result>>, PgmqError> { + ) -> Result>>, PgmqError> { // map vt or default VT let vt_ = match vt { Some(t) => t, @@ -630,7 +631,7 @@ impl PGMQueue { max_batch_size: i32, poll_timeout: Option, poll_interval: Option, - ) -> Result>>, PgmqError> { + ) -> Result>>, PgmqError> { let vt_ = vt.unwrap_or(types::VT_DEFAULT); let poll_timeout_ = poll_timeout.unwrap_or(types::POLL_TIMEOUT_DEFAULT); let poll_interval_ = poll_interval.unwrap_or(types::POLL_INTERVAL_DEFAULT); @@ -866,7 +867,7 @@ impl PGMQueue { /// Example: /// /// ```rust - /// use pgmq::{types::Message, PgmqError, PGMQueue}; + /// use pgmq::{Message, PgmqError, PGMQueue}; /// use serde::{Deserialize, Serialize}; /// use serde_json::Value; /// @@ -903,7 +904,7 @@ impl PGMQueue { pub async fn pop Deserialize<'de>>( &self, queue_name: &str, - ) -> Result>, PgmqError> { + ) -> Result>, PgmqError> { let query = &query::pop(queue_name)?; let message = util::fetch_one_message::(query, &self.connection).await?; Ok(message) @@ -959,7 +960,7 @@ impl PGMQueue { queue_name: &str, msg_id: i64, vt: chrono::DateTime, - ) -> Result>, PgmqError> { + ) -> Result>, PgmqError> { let query = &query::set_vt(queue_name, msg_id, vt)?; let updated_message = util::fetch_one_message::(query, &self.connection).await?; Ok(updated_message) @@ -972,8 +973,8 @@ impl PGMQueue { async fn fetch_messages Deserialize<'de>>( query: &str, connection: &Pool, -) -> Result>>, PgmqError> { - let mut messages: Vec> = Vec::new(); +) -> Result>>, PgmqError> { + let mut messages: Vec> = Vec::new(); let result: Result, Error> = sqlx::query(query).fetch_all(connection).await; match result { Ok(rows) => { @@ -987,7 +988,7 @@ async fn fetch_messages Deserialize<'de>>( if let Err(e) = parsed_msg { return Err(PgmqError::JsonParsingError(e)); } else if let Ok(parsed_msg) = parsed_msg { - messages.push(types::Message { + messages.push(Message { msg_id: row.get("msg_id"), vt: row.get("vt"), read_ct: row.get("read_ct"),