From 863c1d6039e8fe114e48d62c0451d6eb5e4867a2 Mon Sep 17 00:00:00 2001
From: James Guthrie <JamesGuthrie@users.noreply.github.com>
Date: Tue, 7 Nov 2023 22:09:39 +0100
Subject: [PATCH 001/106] fix code block

---
 postgres-types/src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 52b5c773a..aaf145e6b 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -168,6 +168,8 @@
 //!   'Happy'
 //! );
 //! ```
+//!
+//! ```rust
 //! #[postgres(allow_mismatch)]
 //! enum Mood {
 //!    Happy,

From 10edbcb46c44933417e8d2e7a1c1d63c4119beb3 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 7 Nov 2023 16:23:06 -0500
Subject: [PATCH 002/106] Update lib.rs

---
 postgres-types/src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index aaf145e6b..2f02f6e5f 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -170,6 +170,11 @@
 //! ```
 //!
 //! ```rust
+//! # #[cfg(feature = "derive")]
+//! use postgres_types::{ToSql, FromSql};
+//!
+//! # #[cfg(feature = "derive")]
+//! #[derive(Debug, ToSql, FromSql)]
 //! #[postgres(allow_mismatch)]
 //! enum Mood {
 //!    Happy,

From 02bab67280f8a850b816754b29eb0364708604ec Mon Sep 17 00:00:00 2001
From: "Michael P. Jung" <michael.jung@terreon.de>
Date: Tue, 5 Dec 2023 13:54:20 +0100
Subject: [PATCH 003/106] Add table_oid and field_id to columns of prepared
 statements

---
 tokio-postgres/CHANGELOG.md     |  2 +-
 tokio-postgres/src/prepare.rs   |  8 +++++++-
 tokio-postgres/src/statement.rs | 23 +++++++++++++++++------
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index bd076eef9..9f5eb9521 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 * Disable `rustc-serialize` compatibility of `eui48-1` dependency
 * Remove tests for `eui48-04`
-
+* Add `table_oid` and `field_id` fields to `Columns` struct of prepared statements.
 
 ## v0.7.10 - 2023-08-25
 
diff --git a/tokio-postgres/src/prepare.rs b/tokio-postgres/src/prepare.rs
index e3f09a7c2..1ab34e2df 100644
--- a/tokio-postgres/src/prepare.rs
+++ b/tokio-postgres/src/prepare.rs
@@ -12,6 +12,7 @@ use log::debug;
 use postgres_protocol::message::backend::Message;
 use postgres_protocol::message::frontend;
 use std::future::Future;
+use std::num::{NonZeroI16, NonZeroU32};
 use std::pin::Pin;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
@@ -95,7 +96,12 @@ pub async fn prepare(
         let mut it = row_description.fields();
         while let Some(field) = it.next().map_err(Error::parse)? {
             let type_ = get_type(client, field.type_oid()).await?;
-            let column = Column::new(field.name().to_string(), type_);
+            let column = Column {
+                name: field.name().to_string(),
+                table_oid: NonZeroU32::new(field.table_oid()),
+                column_id: NonZeroI16::new(field.column_id()),
+                type_,
+            };
             columns.push(column);
         }
     }
diff --git a/tokio-postgres/src/statement.rs b/tokio-postgres/src/statement.rs
index 97561a8e4..73d56c220 100644
--- a/tokio-postgres/src/statement.rs
+++ b/tokio-postgres/src/statement.rs
@@ -5,6 +5,7 @@ use crate::types::Type;
 use postgres_protocol::message::frontend;
 use std::{
     fmt,
+    num::{NonZeroI16, NonZeroU32},
     sync::{Arc, Weak},
 };
 
@@ -66,20 +67,28 @@ impl Statement {
 
 /// Information about a column of a query.
 pub struct Column {
-    name: String,
-    type_: Type,
+    pub(crate) name: String,
+    pub(crate) table_oid: Option<NonZeroU32>,
+    pub(crate) column_id: Option<NonZeroI16>,
+    pub(crate) type_: Type,
 }
 
 impl Column {
-    pub(crate) fn new(name: String, type_: Type) -> Column {
-        Column { name, type_ }
-    }
-
     /// Returns the name of the column.
     pub fn name(&self) -> &str {
         &self.name
     }
 
+    /// Returns the OID of the underlying database table.
+    pub fn table_oid(&self) -> Option<NonZeroU32> {
+        self.table_oid
+    }
+
+    /// Return the column ID within the underlying database table.
+    pub fn column_id(&self) -> Option<NonZeroI16> {
+        self.column_id
+    }
+
     /// Returns the type of the column.
     pub fn type_(&self) -> &Type {
         &self.type_
@@ -90,6 +99,8 @@ impl fmt::Debug for Column {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Column")
             .field("name", &self.name)
+            .field("table_oid", &self.table_oid)
+            .field("column_id", &self.column_id)
             .field("type", &self.type_)
             .finish()
     }

From 87876150d79e637767247176e339bf01a8b32d3b Mon Sep 17 00:00:00 2001
From: "Michael P. Jung" <michael.jung@terreon.de>
Date: Tue, 5 Dec 2023 14:09:44 +0100
Subject: [PATCH 004/106] Simplify Debug impl of Column

---
 tokio-postgres/src/prepare.rs   |  2 +-
 tokio-postgres/src/statement.rs | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/tokio-postgres/src/prepare.rs b/tokio-postgres/src/prepare.rs
index 1ab34e2df..0302cdb4c 100644
--- a/tokio-postgres/src/prepare.rs
+++ b/tokio-postgres/src/prepare.rs
@@ -100,7 +100,7 @@ pub async fn prepare(
                 name: field.name().to_string(),
                 table_oid: NonZeroU32::new(field.table_oid()),
                 column_id: NonZeroI16::new(field.column_id()),
-                type_,
+                r#type: type_,
             };
             columns.push(column);
         }
diff --git a/tokio-postgres/src/statement.rs b/tokio-postgres/src/statement.rs
index 73d56c220..fe3b6b7a1 100644
--- a/tokio-postgres/src/statement.rs
+++ b/tokio-postgres/src/statement.rs
@@ -4,7 +4,6 @@ use crate::connection::RequestMessages;
 use crate::types::Type;
 use postgres_protocol::message::frontend;
 use std::{
-    fmt,
     num::{NonZeroI16, NonZeroU32},
     sync::{Arc, Weak},
 };
@@ -66,11 +65,12 @@ impl Statement {
 }
 
 /// Information about a column of a query.
+#[derive(Debug)]
 pub struct Column {
     pub(crate) name: String,
     pub(crate) table_oid: Option<NonZeroU32>,
     pub(crate) column_id: Option<NonZeroI16>,
-    pub(crate) type_: Type,
+    pub(crate) r#type: Type,
 }
 
 impl Column {
@@ -91,17 +91,6 @@ impl Column {
 
     /// Returns the type of the column.
     pub fn type_(&self) -> &Type {
-        &self.type_
-    }
-}
-
-impl fmt::Debug for Column {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt.debug_struct("Column")
-            .field("name", &self.name)
-            .field("table_oid", &self.table_oid)
-            .field("column_id", &self.column_id)
-            .field("type", &self.type_)
-            .finish()
+        &self.r#type
     }
 }

From bbc04145de7a83dfa66cb3cf4a68878da2c1cc32 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 11 Dec 2023 19:06:22 -0500
Subject: [PATCH 005/106] Update id types

---
 tokio-postgres/src/prepare.rs   |  5 ++---
 tokio-postgres/src/statement.rs | 13 +++++--------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/tokio-postgres/src/prepare.rs b/tokio-postgres/src/prepare.rs
index 0302cdb4c..07fb45694 100644
--- a/tokio-postgres/src/prepare.rs
+++ b/tokio-postgres/src/prepare.rs
@@ -12,7 +12,6 @@ use log::debug;
 use postgres_protocol::message::backend::Message;
 use postgres_protocol::message::frontend;
 use std::future::Future;
-use std::num::{NonZeroI16, NonZeroU32};
 use std::pin::Pin;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
@@ -98,8 +97,8 @@ pub async fn prepare(
             let type_ = get_type(client, field.type_oid()).await?;
             let column = Column {
                 name: field.name().to_string(),
-                table_oid: NonZeroU32::new(field.table_oid()),
-                column_id: NonZeroI16::new(field.column_id()),
+                table_oid: Some(field.table_oid()).filter(|n| *n != 0),
+                column_id: Some(field.column_id()).filter(|n| *n != 0),
                 r#type: type_,
             };
             columns.push(column);
diff --git a/tokio-postgres/src/statement.rs b/tokio-postgres/src/statement.rs
index fe3b6b7a1..c5d657738 100644
--- a/tokio-postgres/src/statement.rs
+++ b/tokio-postgres/src/statement.rs
@@ -3,10 +3,7 @@ use crate::codec::FrontendMessage;
 use crate::connection::RequestMessages;
 use crate::types::Type;
 use postgres_protocol::message::frontend;
-use std::{
-    num::{NonZeroI16, NonZeroU32},
-    sync::{Arc, Weak},
-};
+use std::sync::{Arc, Weak};
 
 struct StatementInner {
     client: Weak<InnerClient>,
@@ -68,8 +65,8 @@ impl Statement {
 #[derive(Debug)]
 pub struct Column {
     pub(crate) name: String,
-    pub(crate) table_oid: Option<NonZeroU32>,
-    pub(crate) column_id: Option<NonZeroI16>,
+    pub(crate) table_oid: Option<u32>,
+    pub(crate) column_id: Option<i16>,
     pub(crate) r#type: Type,
 }
 
@@ -80,12 +77,12 @@ impl Column {
     }
 
     /// Returns the OID of the underlying database table.
-    pub fn table_oid(&self) -> Option<NonZeroU32> {
+    pub fn table_oid(&self) -> Option<u32> {
         self.table_oid
     }
 
     /// Return the column ID within the underlying database table.
-    pub fn column_id(&self) -> Option<NonZeroI16> {
+    pub fn column_id(&self) -> Option<i16> {
         self.column_id
     }
 

From 90c92c2ae8577a8e771333c701280485c45ad602 Mon Sep 17 00:00:00 2001
From: Troy Benson <troybensonsa@gmail.com>
Date: Mon, 15 Jan 2024 16:33:27 +0000
Subject: [PATCH 006/106] feat(types): add default derive to json wrapper

Adds a Default impl for `Json<T> where T: Default` allowing for other
structs to use the wrapper and implement Default.
---
 postgres-types/src/serde_json_1.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres-types/src/serde_json_1.rs b/postgres-types/src/serde_json_1.rs
index b98d561d1..715c33f98 100644
--- a/postgres-types/src/serde_json_1.rs
+++ b/postgres-types/src/serde_json_1.rs
@@ -7,7 +7,7 @@ use std::fmt::Debug;
 use std::io::Read;
 
 /// A wrapper type to allow arbitrary `Serialize`/`Deserialize` types to convert to Postgres JSON values.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Default, Debug, PartialEq, Eq)]
 pub struct Json<T>(pub T);
 
 impl<'a, T> FromSql<'a> for Json<T>

From 2f150a7e50ee03cbccf52792b7e4507dbcef0301 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 13:49:51 +0000
Subject: [PATCH 007/106] Update env_logger requirement from 0.10 to 0.11

Updates the requirements on [env_logger](https://github.com/rust-cli/env_logger) to permit the latest version.
- [Release notes](https://github.com/rust-cli/env_logger/releases)
- [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-cli/env_logger/compare/v0.10.0...v0.11.0)

---
updated-dependencies:
- dependency-name: env_logger
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tokio-postgres/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index bb58eb2d9..237f3d2f1 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -67,7 +67,7 @@ socket2 = { version = "0.5", features = ["all"] }
 [dev-dependencies]
 futures-executor = "0.3"
 criterion = "0.5"
-env_logger = "0.10"
+env_logger = "0.11"
 tokio = { version = "1.0", features = [
     "macros",
     "net",

From 7bc3deb989b3030681b742801bfeaca7f67e1e1e Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 22 Jan 2024 20:49:47 -0500
Subject: [PATCH 008/106] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 008158fb0..0cc823d35 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
       - run: docker compose up -d
       - uses: sfackler/actions/rustup@master
         with:
-          version: 1.70.0
+          version: 1.71.0
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
       - uses: actions/cache@v3

From a92c6eb2b65e12d7145a14cec23888d64c4b13e4 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 22 Jan 2024 20:54:11 -0500
Subject: [PATCH 009/106] Update main.rs

---
 tokio-postgres/tests/test/main.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tokio-postgres/tests/test/main.rs b/tokio-postgres/tests/test/main.rs
index 0ab4a7bab..737f46631 100644
--- a/tokio-postgres/tests/test/main.rs
+++ b/tokio-postgres/tests/test/main.rs
@@ -303,6 +303,7 @@ async fn custom_range() {
 }
 
 #[tokio::test]
+#[allow(clippy::get_first)]
 async fn simple_query() {
     let client = connect("user=postgres").await;
 

From 289cf887600785e723628dcbc1f7a2267cd52917 Mon Sep 17 00:00:00 2001
From: Charles Samuels <ks@ks.ax>
Date: Fri, 16 Feb 2024 10:55:08 -0800
Subject: [PATCH 010/106] add #[track_caller] to the Row::get() functions

This small quality-of-life improvement changes these errors:

thread '<unnamed>' panicked at /../.cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-postgres-0.7.10/src/row.rs:151:25:
error retrieving column 0: error deserializing column 0: a Postgres value was `NULL`

to:

thread '<unnamed>' panicked at my-program.rs:100:25:
error retrieving column 0: error deserializing column 0: a Postgres value was `NULL`
---
 tokio-postgres/src/row.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tokio-postgres/src/row.rs b/tokio-postgres/src/row.rs
index db179b432..3c79de603 100644
--- a/tokio-postgres/src/row.rs
+++ b/tokio-postgres/src/row.rs
@@ -141,6 +141,7 @@ impl Row {
     /// # Panics
     ///
     /// Panics if the index is out of bounds or if the value cannot be converted to the specified type.
+    #[track_caller]
     pub fn get<'a, I, T>(&'a self, idx: I) -> T
     where
         I: RowIndex + fmt::Display,
@@ -239,6 +240,7 @@ impl SimpleQueryRow {
     /// # Panics
     ///
     /// Panics if the index is out of bounds or if the value cannot be converted to the specified type.
+    #[track_caller]
     pub fn get<I>(&self, idx: I) -> Option<&str>
     where
         I: RowIndex + fmt::Display,

From 25314a91c95dc8f75062e337eb363188c63df5d4 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 17 Feb 2024 09:52:44 -0500
Subject: [PATCH 011/106] Bump CI version

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0cc823d35..641a42722 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
       - run: docker compose up -d
       - uses: sfackler/actions/rustup@master
         with:
-          version: 1.71.0
+          version: 1.74.0
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
       - uses: actions/cache@v3

From a9ca481c88fb619c6d35f2a6b64253bb46240c5d Mon Sep 17 00:00:00 2001
From: "chandr-andr (Kiselev Aleksandr)" <askiselev00@gmail.com>
Date: Sun, 3 Mar 2024 16:37:30 +0100
Subject: [PATCH 012/106] Added ReadOnly session attr

---
 tokio-postgres/src/config.rs       | 3 +++
 tokio-postgres/tests/test/parse.rs | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/tokio-postgres/src/config.rs b/tokio-postgres/src/config.rs
index b178eac80..c78346fff 100644
--- a/tokio-postgres/src/config.rs
+++ b/tokio-postgres/src/config.rs
@@ -34,6 +34,8 @@ pub enum TargetSessionAttrs {
     Any,
     /// The session must allow writes.
     ReadWrite,
+    /// The session allow only reads.
+    ReadOnly,
 }
 
 /// TLS configuration.
@@ -622,6 +624,7 @@ impl Config {
                 let target_session_attrs = match value {
                     "any" => TargetSessionAttrs::Any,
                     "read-write" => TargetSessionAttrs::ReadWrite,
+                    "read-only" => TargetSessionAttrs::ReadOnly,
                     _ => {
                         return Err(Error::config_parse(Box::new(InvalidValue(
                             "target_session_attrs",
diff --git a/tokio-postgres/tests/test/parse.rs b/tokio-postgres/tests/test/parse.rs
index 2c11899ca..04d422e27 100644
--- a/tokio-postgres/tests/test/parse.rs
+++ b/tokio-postgres/tests/test/parse.rs
@@ -34,6 +34,14 @@ fn settings() {
             .keepalives_idle(Duration::from_secs(30))
             .target_session_attrs(TargetSessionAttrs::ReadWrite),
     );
+    check(
+        "connect_timeout=3 keepalives=0 keepalives_idle=30 target_session_attrs=read-only",
+        Config::new()
+            .connect_timeout(Duration::from_secs(3))
+            .keepalives(false)
+            .keepalives_idle(Duration::from_secs(30))
+            .target_session_attrs(TargetSessionAttrs::ReadOnly),
+    );
 }
 
 #[test]

From 6a01730cbfed5d9c0aa694401704e6fe7ec0c8b5 Mon Sep 17 00:00:00 2001
From: "chandr-andr (Kiselev Aleksandr)" <askiselev00@gmail.com>
Date: Sun, 3 Mar 2024 19:17:50 +0100
Subject: [PATCH 013/106] Added ReadOnly session attr

---
 tokio-postgres/src/connect.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tokio-postgres/src/connect.rs b/tokio-postgres/src/connect.rs
index ca57b9cdd..8189cb91c 100644
--- a/tokio-postgres/src/connect.rs
+++ b/tokio-postgres/src/connect.rs
@@ -160,7 +160,7 @@ where
     let has_hostname = hostname.is_some();
     let (mut client, mut connection) = connect_raw(socket, tls, has_hostname, config).await?;
 
-    if let TargetSessionAttrs::ReadWrite = config.target_session_attrs {
+    if config.target_session_attrs != TargetSessionAttrs::Any {
         let rows = client.simple_query_raw("SHOW transaction_read_only");
         pin_mut!(rows);
 
@@ -185,11 +185,21 @@ where
 
             match next.await.transpose()? {
                 Some(SimpleQueryMessage::Row(row)) => {
-                    if row.try_get(0)? == Some("on") {
+                    let read_only_result = row.try_get(0)?;
+                    if read_only_result == Some("on")
+                        && config.target_session_attrs == TargetSessionAttrs::ReadWrite
+                    {
                         return Err(Error::connect(io::Error::new(
                             io::ErrorKind::PermissionDenied,
                             "database does not allow writes",
                         )));
+                    } else if read_only_result == Some("off")
+                        && config.target_session_attrs == TargetSessionAttrs::ReadOnly
+                    {
+                        return Err(Error::connect(io::Error::new(
+                            io::ErrorKind::PermissionDenied,
+                            "database is not read only",
+                        )));
                     } else {
                         break;
                     }

From 4217553586c4ce390179a281834b8f2c3197863e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 13:45:26 +0000
Subject: [PATCH 014/106] Update base64 requirement from 0.21 to 0.22

Updates the requirements on [base64](https://github.com/marshallpierce/rust-base64) to permit the latest version.
- [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/marshallpierce/rust-base64/compare/v0.21.0...v0.22.0)

---
updated-dependencies:
- dependency-name: base64
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 postgres-protocol/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres-protocol/Cargo.toml b/postgres-protocol/Cargo.toml
index b44994811..bc83fc4e6 100644
--- a/postgres-protocol/Cargo.toml
+++ b/postgres-protocol/Cargo.toml
@@ -13,7 +13,7 @@ default = []
 js = ["getrandom/js"]
 
 [dependencies]
-base64 = "0.21"
+base64 = "0.22"
 byteorder = "1.0"
 bytes = "1.0"
 fallible-iterator = "0.2"

From 9d7c43c73955638624e75957a333fac5d9be1c02 Mon Sep 17 00:00:00 2001
From: novacrazy <novacrazy@gmail.com>
Date: Sun, 11 Feb 2024 03:03:19 -0600
Subject: [PATCH 015/106] Shrink query_opt/query_one codegen size very slightly

---
 tokio-postgres/src/client.rs | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
index 427a05049..d48a23a60 100644
--- a/tokio-postgres/src/client.rs
+++ b/tokio-postgres/src/client.rs
@@ -274,19 +274,9 @@ impl Client {
     where
         T: ?Sized + ToStatement,
     {
-        let stream = self.query_raw(statement, slice_iter(params)).await?;
-        pin_mut!(stream);
-
-        let row = match stream.try_next().await? {
-            Some(row) => row,
-            None => return Err(Error::row_count()),
-        };
-
-        if stream.try_next().await?.is_some() {
-            return Err(Error::row_count());
-        }
-
-        Ok(row)
+        self.query_opt(statement, params)
+            .await
+            .and_then(|res| res.ok_or_else(Error::row_count))
     }
 
     /// Executes a statements which returns zero or one rows, returning it.
@@ -310,16 +300,22 @@ impl Client {
         let stream = self.query_raw(statement, slice_iter(params)).await?;
         pin_mut!(stream);
 
-        let row = match stream.try_next().await? {
-            Some(row) => row,
-            None => return Ok(None),
-        };
+        let mut first = None;
+
+        // Originally this was two calls to `try_next().await?`,
+        // once for the first element, and second to error if more than one.
+        //
+        // However, this new form with only one .await in a loop generates
+        // slightly smaller codegen/stack usage for the resulting future.
+        while let Some(row) = stream.try_next().await? {
+            if first.is_some() {
+                return Err(Error::row_count());
+            }
 
-        if stream.try_next().await?.is_some() {
-            return Err(Error::row_count());
+            first = Some(row);
         }
 
-        Ok(Some(row))
+        Ok(first)
     }
 
     /// The maximally flexible version of [`query`].

From 97436303232127dbd448d71a50c6365bdbee083c Mon Sep 17 00:00:00 2001
From: laxjesse <jesse@osohq.com>
Date: Wed, 13 Mar 2024 11:10:58 -0400
Subject: [PATCH 016/106] use `split_once` instead of `split` to parse lsn
 strings

[`str::split`](https://doc.rust-lang.org/std/primitive.str.html#method.split)
allocates a vector and generates considerably more instructions when compiled
than [`str::split_once`](https://doc.rust-lang.org/std/primitive.str.html#method.split_once).

[`u64::from_str_radix(split_lo, 16)`](https://doc.rust-lang.org/std/primitive.u64.html#method.from_str_radix)
will error if the `lsn_str` contains more than one `/` so this change should
result in the same behavior as the current implementation despite not explicitly
checking this.
---
 postgres-types/CHANGELOG.md  |  6 ++++++
 postgres-types/src/pg_lsn.rs | 18 ++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/postgres-types/CHANGELOG.md b/postgres-types/CHANGELOG.md
index 72a1cbb6a..157a2cc7d 100644
--- a/postgres-types/CHANGELOG.md
+++ b/postgres-types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### Changed
+
+* `FromStr` implementation for `PgLsn` no longer allocates a `Vec` when splitting an lsn string on it's `/`.
+
 ## v0.2.6 - 2023-08-19
 
 ### Fixed
diff --git a/postgres-types/src/pg_lsn.rs b/postgres-types/src/pg_lsn.rs
index f0bbf4022..f339f9689 100644
--- a/postgres-types/src/pg_lsn.rs
+++ b/postgres-types/src/pg_lsn.rs
@@ -33,16 +33,14 @@ impl FromStr for PgLsn {
     type Err = ParseLsnError;
 
     fn from_str(lsn_str: &str) -> Result<Self, Self::Err> {
-        let split: Vec<&str> = lsn_str.split('/').collect();
-        if split.len() == 2 {
-            let (hi, lo) = (
-                u64::from_str_radix(split[0], 16).map_err(|_| ParseLsnError(()))?,
-                u64::from_str_radix(split[1], 16).map_err(|_| ParseLsnError(()))?,
-            );
-            Ok(PgLsn((hi << 32) | lo))
-        } else {
-            Err(ParseLsnError(()))
-        }
+        let Some((split_hi, split_lo)) = lsn_str.split_once('/') else {
+            return Err(ParseLsnError(()));
+        };
+        let (hi, lo) = (
+            u64::from_str_radix(split_hi, 16).map_err(|_| ParseLsnError(()))?,
+            u64::from_str_radix(split_lo, 16).map_err(|_| ParseLsnError(()))?,
+        );
+        Ok(PgLsn((hi << 32) | lo))
     }
 }
 

From 3836a3052065bccf53001b832a21823204bfa137 Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo.barbolini@m4ss.net>
Date: Wed, 10 Apr 2024 17:42:13 +0200
Subject: [PATCH 017/106] Make license metadata SPDX compliant

---
 postgres-derive/Cargo.toml     | 4 ++--
 postgres-native-tls/Cargo.toml | 2 +-
 postgres-openssl/Cargo.toml    | 2 +-
 postgres-protocol/Cargo.toml   | 2 +-
 postgres-types/Cargo.toml      | 2 +-
 postgres/Cargo.toml            | 2 +-
 tokio-postgres/Cargo.toml      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/postgres-derive/Cargo.toml b/postgres-derive/Cargo.toml
index 51ebb5663..5d1604b24 100644
--- a/postgres-derive/Cargo.toml
+++ b/postgres-derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "postgres-derive"
 version = "0.4.5"
 authors = ["Steven Fackler <sfackler@palantir.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 description = "An internal crate used by postgres-types"
 repository = "https://github.com/sfackler/rust-postgres"
@@ -15,4 +15,4 @@ test = false
 syn = "2.0"
 proc-macro2 = "1.0"
 quote = "1.0"
-heck = "0.4"
\ No newline at end of file
+heck = "0.4"
diff --git a/postgres-native-tls/Cargo.toml b/postgres-native-tls/Cargo.toml
index 1f2f6385d..936eeeaa4 100644
--- a/postgres-native-tls/Cargo.toml
+++ b/postgres-native-tls/Cargo.toml
@@ -3,7 +3,7 @@ name = "postgres-native-tls"
 version = "0.5.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "TLS support for tokio-postgres via native-tls"
 repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"
diff --git a/postgres-openssl/Cargo.toml b/postgres-openssl/Cargo.toml
index 8671308af..b7ebd3385 100644
--- a/postgres-openssl/Cargo.toml
+++ b/postgres-openssl/Cargo.toml
@@ -3,7 +3,7 @@ name = "postgres-openssl"
 version = "0.5.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "TLS support for tokio-postgres via openssl"
 repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"
diff --git a/postgres-protocol/Cargo.toml b/postgres-protocol/Cargo.toml
index bc83fc4e6..a8a130495 100644
--- a/postgres-protocol/Cargo.toml
+++ b/postgres-protocol/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.6.6"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 description = "Low level Postgres protocol APIs"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"
 
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index cfd083637..bf011251b 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -3,7 +3,7 @@ name = "postgres-types"
 version = "0.2.6"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "Conversions between Rust and Postgres values"
 repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index 18406da9f..2ff3c875e 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -3,7 +3,7 @@ name = "postgres"
 version = "0.19.7"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "A native, synchronous PostgreSQL client"
 repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index 237f3d2f1..b3e56314f 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -3,7 +3,7 @@ name = "tokio-postgres"
 version = "0.7.10"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 description = "A native, asynchronous PostgreSQL client"
 repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"

From 670cd7d5802dfb3b0b6b1eadd480f5c9730bb0b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 16:21:21 +0000
Subject: [PATCH 018/106] Update heck requirement from 0.4 to 0.5

---
updated-dependencies:
- dependency-name: heck
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 postgres-derive/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres-derive/Cargo.toml b/postgres-derive/Cargo.toml
index 5d1604b24..cbae6c77b 100644
--- a/postgres-derive/Cargo.toml
+++ b/postgres-derive/Cargo.toml
@@ -15,4 +15,4 @@ test = false
 syn = "2.0"
 proc-macro2 = "1.0"
 quote = "1.0"
-heck = "0.4"
+heck = "0.5"

From 3c6dbe9b8c7bfad82c646f34092e3fa1d321b723 Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <YuriAstrakhan@gmail.com>
Date: Wed, 1 May 2024 22:46:06 -0400
Subject: [PATCH 019/106] Avoid extra clone in config if possible

Using `impl Into<String>` instead of `&str` in a fn arg allows both `&str` and `String` as parameters - thus if the caller already has a String object that it doesn't need, it can pass it in without extra cloning.

The same might be done with the password, but may require closer look.
---
 tokio-postgres/src/config.rs | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tokio-postgres/src/config.rs b/tokio-postgres/src/config.rs
index c78346fff..62b45f793 100644
--- a/tokio-postgres/src/config.rs
+++ b/tokio-postgres/src/config.rs
@@ -248,8 +248,8 @@ impl Config {
     /// Sets the user to authenticate with.
     ///
     /// Defaults to the user executing this process.
-    pub fn user(&mut self, user: &str) -> &mut Config {
-        self.user = Some(user.to_string());
+    pub fn user(&mut self, user: impl Into<String>) -> &mut Config {
+        self.user = Some(user.into());
         self
     }
 
@@ -277,8 +277,8 @@ impl Config {
     /// Sets the name of the database to connect to.
     ///
     /// Defaults to the user.
-    pub fn dbname(&mut self, dbname: &str) -> &mut Config {
-        self.dbname = Some(dbname.to_string());
+    pub fn dbname(&mut self, dbname: impl Into<String>) -> &mut Config {
+        self.dbname = Some(dbname.into());
         self
     }
 
@@ -289,8 +289,8 @@ impl Config {
     }
 
     /// Sets command line options used to configure the server.
-    pub fn options(&mut self, options: &str) -> &mut Config {
-        self.options = Some(options.to_string());
+    pub fn options(&mut self, options: impl Into<String>) -> &mut Config {
+        self.options = Some(options.into());
         self
     }
 
@@ -301,8 +301,8 @@ impl Config {
     }
 
     /// Sets the value of the `application_name` runtime parameter.
-    pub fn application_name(&mut self, application_name: &str) -> &mut Config {
-        self.application_name = Some(application_name.to_string());
+    pub fn application_name(&mut self, application_name: impl Into<String>) -> &mut Config {
+        self.application_name = Some(application_name.into());
         self
     }
 
@@ -330,7 +330,9 @@ impl Config {
     /// Multiple hosts can be specified by calling this method multiple times, and each will be tried in order. On Unix
     /// systems, a host starting with a `/` is interpreted as a path to a directory containing Unix domain sockets.
     /// There must be either no hosts, or the same number of hosts as hostaddrs.
-    pub fn host(&mut self, host: &str) -> &mut Config {
+    pub fn host(&mut self, host: impl Into<String>) -> &mut Config {
+        let host = host.into();
+
         #[cfg(unix)]
         {
             if host.starts_with('/') {
@@ -338,7 +340,7 @@ impl Config {
             }
         }
 
-        self.host.push(Host::Tcp(host.to_string()));
+        self.host.push(Host::Tcp(host));
         self
     }
 
@@ -990,7 +992,7 @@ impl<'a> UrlParser<'a> {
 
         let mut it = creds.splitn(2, ':');
         let user = self.decode(it.next().unwrap())?;
-        self.config.user(&user);
+        self.config.user(user);
 
         if let Some(password) = it.next() {
             let password = Cow::from(percent_encoding::percent_decode(password.as_bytes()));
@@ -1053,7 +1055,7 @@ impl<'a> UrlParser<'a> {
         };
 
         if !dbname.is_empty() {
-            self.config.dbname(&self.decode(dbname)?);
+            self.config.dbname(self.decode(dbname)?);
         }
 
         Ok(())

From d5d75d3a2f064425436c08b6a8f2da2b985aab3d Mon Sep 17 00:00:00 2001
From: vsuryamurthy <v.sury@fizyr.com>
Date: Thu, 23 May 2024 17:18:41 +0200
Subject: [PATCH 020/106] add simple_query to GenericClient in tokio_postgres

---
 tokio-postgres/CHANGELOG.md          |  1 +
 tokio-postgres/src/generic_client.rs | 35 ++++++++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index 9f5eb9521..775c22e34 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Disable `rustc-serialize` compatibility of `eui48-1` dependency
 * Remove tests for `eui48-04`
 * Add `table_oid` and `field_id` fields to `Columns` struct of prepared statements.
+* Add `GenericClient::simple_query`.
 
 ## v0.7.10 - 2023-08-25
 
diff --git a/tokio-postgres/src/generic_client.rs b/tokio-postgres/src/generic_client.rs
index 50cff9712..d80dd3b86 100644
--- a/tokio-postgres/src/generic_client.rs
+++ b/tokio-postgres/src/generic_client.rs
@@ -1,6 +1,6 @@
 use crate::query::RowStream;
 use crate::types::{BorrowToSql, ToSql, Type};
-use crate::{Client, Error, Row, Statement, ToStatement, Transaction};
+use crate::{Client, Error, Row, SimpleQueryMessage, Statement, ToStatement, Transaction};
 use async_trait::async_trait;
 
 mod private {
@@ -12,12 +12,12 @@ mod private {
 /// This trait is "sealed", and cannot be implemented outside of this crate.
 #[async_trait]
 pub trait GenericClient: private::Sealed {
-    /// Like `Client::execute`.
+    /// Like [`Client::execute`].
     async fn execute<T>(&self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error>
     where
         T: ?Sized + ToStatement + Sync + Send;
 
-    /// Like `Client::execute_raw`.
+    /// Like [`Client::execute_raw`].
     async fn execute_raw<P, I, T>(&self, statement: &T, params: I) -> Result<u64, Error>
     where
         T: ?Sized + ToStatement + Sync + Send,
@@ -25,12 +25,12 @@ pub trait GenericClient: private::Sealed {
         I: IntoIterator<Item = P> + Sync + Send,
         I::IntoIter: ExactSizeIterator;
 
-    /// Like `Client::query`.
+    /// Like [`Client::query`].
     async fn query<T>(&self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<Vec<Row>, Error>
     where
         T: ?Sized + ToStatement + Sync + Send;
 
-    /// Like `Client::query_one`.
+    /// Like [`Client::query_one`].
     async fn query_one<T>(
         &self,
         statement: &T,
@@ -39,7 +39,7 @@ pub trait GenericClient: private::Sealed {
     where
         T: ?Sized + ToStatement + Sync + Send;
 
-    /// Like `Client::query_opt`.
+    /// Like [`Client::query_opt`].
     async fn query_opt<T>(
         &self,
         statement: &T,
@@ -48,7 +48,7 @@ pub trait GenericClient: private::Sealed {
     where
         T: ?Sized + ToStatement + Sync + Send;
 
-    /// Like `Client::query_raw`.
+    /// Like [`Client::query_raw`].
     async fn query_raw<T, P, I>(&self, statement: &T, params: I) -> Result<RowStream, Error>
     where
         T: ?Sized + ToStatement + Sync + Send,
@@ -56,23 +56,26 @@ pub trait GenericClient: private::Sealed {
         I: IntoIterator<Item = P> + Sync + Send,
         I::IntoIter: ExactSizeIterator;
 
-    /// Like `Client::prepare`.
+    /// Like [`Client::prepare`].
     async fn prepare(&self, query: &str) -> Result<Statement, Error>;
 
-    /// Like `Client::prepare_typed`.
+    /// Like [`Client::prepare_typed`].
     async fn prepare_typed(
         &self,
         query: &str,
         parameter_types: &[Type],
     ) -> Result<Statement, Error>;
 
-    /// Like `Client::transaction`.
+    /// Like [`Client::transaction`].
     async fn transaction(&mut self) -> Result<Transaction<'_>, Error>;
 
-    /// Like `Client::batch_execute`.
+    /// Like [`Client::batch_execute`].
     async fn batch_execute(&self, query: &str) -> Result<(), Error>;
 
-    /// Returns a reference to the underlying `Client`.
+    /// Like [`Client::simple_query`].
+    async fn simple_query(&self, query: &str) -> Result<Vec<SimpleQueryMessage>, Error>;
+
+    /// Returns a reference to the underlying [`Client`].
     fn client(&self) -> &Client;
 }
 
@@ -156,6 +159,10 @@ impl GenericClient for Client {
         self.batch_execute(query).await
     }
 
+    async fn simple_query(&self, query: &str) -> Result<Vec<SimpleQueryMessage>, Error> {
+        self.simple_query(query).await
+    }
+
     fn client(&self) -> &Client {
         self
     }
@@ -243,6 +250,10 @@ impl GenericClient for Transaction<'_> {
         self.batch_execute(query).await
     }
 
+    async fn simple_query(&self, query: &str) -> Result<Vec<SimpleQueryMessage>, Error> {
+        self.simple_query(query).await
+    }
+
     fn client(&self) -> &Client {
         self.client()
     }

From fbecae11ace79376b20ae8b9a587ab577e8287cd Mon Sep 17 00:00:00 2001
From: Duarte Nunes <duarte.nunes@datadoghq.com>
Date: Mon, 11 Mar 2024 14:43:50 -0300
Subject: [PATCH 021/106] feat(types): add 'js' feature for wasm

Enables the "js" feature of postgres-protocol.
---
 postgres-types/Cargo.toml | 1 +
 tokio-postgres/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index bf011251b..33296db2c 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -13,6 +13,7 @@ categories = ["database"]
 [features]
 derive = ["postgres-derive"]
 array-impls = ["array-init"]
+js = ["postgres-protocol/js"]
 with-bit-vec-0_6 = ["bit-vec-06"]
 with-cidr-0_2 = ["cidr-02"]
 with-chrono-0_4 = ["chrono-04"]
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index b3e56314f..2e080cfb2 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -40,7 +40,7 @@ with-uuid-0_8 = ["postgres-types/with-uuid-0_8"]
 with-uuid-1 = ["postgres-types/with-uuid-1"]
 with-time-0_2 = ["postgres-types/with-time-0_2"]
 with-time-0_3 = ["postgres-types/with-time-0_3"]
-js = ["postgres-protocol/js"]
+js = ["postgres-protocol/js", "postgres-types/js"]
 
 [dependencies]
 async-trait = "0.1"

From 6cd4652bad6ac8474235c23d0e4e96cc4aa4d8db Mon Sep 17 00:00:00 2001
From: Dane Rigby <me@danerigby.com>
Date: Tue, 28 May 2024 21:57:27 -0500
Subject: [PATCH 022/106] Add RowDescription to SimpleQueryMessage

---
 tokio-postgres/src/lib.rs          |  6 ++++++
 tokio-postgres/src/simple_query.rs |  5 +++--
 tokio-postgres/tests/test/main.rs  | 13 ++++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs
index 2973d33b0..d650f4db9 100644
--- a/tokio-postgres/src/lib.rs
+++ b/tokio-postgres/src/lib.rs
@@ -118,6 +118,10 @@
 //! | `with-time-0_3` | Enable support for the 0.3 version of the `time` crate. | [time](https://crates.io/crates/time/0.3.0) 0.3 | no |
 #![warn(rust_2018_idioms, clippy::all, missing_docs)]
 
+use std::sync::Arc;
+
+use simple_query::SimpleColumn;
+
 pub use crate::cancel_token::CancelToken;
 pub use crate::client::Client;
 pub use crate::config::Config;
@@ -248,6 +252,8 @@ pub enum SimpleQueryMessage {
     ///
     /// The number of rows modified or selected is returned.
     CommandComplete(u64),
+    /// Column values of the proceeding row values
+    RowDescription(Arc<[SimpleColumn]>)
 }
 
 fn slice_iter<'a>(
diff --git a/tokio-postgres/src/simple_query.rs b/tokio-postgres/src/simple_query.rs
index bcc6d928b..4e0b7734d 100644
--- a/tokio-postgres/src/simple_query.rs
+++ b/tokio-postgres/src/simple_query.rs
@@ -95,14 +95,15 @@ impl Stream for SimpleQueryStream {
                     return Poll::Ready(Some(Ok(SimpleQueryMessage::CommandComplete(0))));
                 }
                 Message::RowDescription(body) => {
-                    let columns = body
+                    let columns: Arc<[SimpleColumn]> = body
                         .fields()
                         .map(|f| Ok(SimpleColumn::new(f.name().to_string())))
                         .collect::<Vec<_>>()
                         .map_err(Error::parse)?
                         .into();
 
-                    *this.columns = Some(columns);
+                    *this.columns = Some(columns.clone());
+                    return Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(columns.clone()))));
                 }
                 Message::DataRow(body) => {
                     let row = match &this.columns {
diff --git a/tokio-postgres/tests/test/main.rs b/tokio-postgres/tests/test/main.rs
index 737f46631..4fa72aec9 100644
--- a/tokio-postgres/tests/test/main.rs
+++ b/tokio-postgres/tests/test/main.rs
@@ -328,6 +328,13 @@ async fn simple_query() {
         _ => panic!("unexpected message"),
     }
     match &messages[2] {
+        SimpleQueryMessage::RowDescription(columns) => {
+            assert_eq!(columns.get(0).map(|c| c.name()), Some("id"));
+            assert_eq!(columns.get(1).map(|c| c.name()), Some("name"));        
+        }
+        _ => panic!("unexpected message")
+    }
+    match &messages[3] {
         SimpleQueryMessage::Row(row) => {
             assert_eq!(row.columns().get(0).map(|c| c.name()), Some("id"));
             assert_eq!(row.columns().get(1).map(|c| c.name()), Some("name"));
@@ -336,7 +343,7 @@ async fn simple_query() {
         }
         _ => panic!("unexpected message"),
     }
-    match &messages[3] {
+    match &messages[4] {
         SimpleQueryMessage::Row(row) => {
             assert_eq!(row.columns().get(0).map(|c| c.name()), Some("id"));
             assert_eq!(row.columns().get(1).map(|c| c.name()), Some("name"));
@@ -345,11 +352,11 @@ async fn simple_query() {
         }
         _ => panic!("unexpected message"),
     }
-    match messages[4] {
+    match messages[5] {
         SimpleQueryMessage::CommandComplete(2) => {}
         _ => panic!("unexpected message"),
     }
-    assert_eq!(messages.len(), 5);
+    assert_eq!(messages.len(), 6);
 }
 
 #[tokio::test]

From 7afead9a13d54f1c5ce9bef5eda1fb7ced26db61 Mon Sep 17 00:00:00 2001
From: Dane Rigby <me@danerigby.com>
Date: Tue, 28 May 2024 22:08:41 -0500
Subject: [PATCH 023/106] Formatting updates

---
 tokio-postgres/src/lib.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs
index d650f4db9..6c6266736 100644
--- a/tokio-postgres/src/lib.rs
+++ b/tokio-postgres/src/lib.rs
@@ -118,10 +118,6 @@
 //! | `with-time-0_3` | Enable support for the 0.3 version of the `time` crate. | [time](https://crates.io/crates/time/0.3.0) 0.3 | no |
 #![warn(rust_2018_idioms, clippy::all, missing_docs)]
 
-use std::sync::Arc;
-
-use simple_query::SimpleColumn;
-
 pub use crate::cancel_token::CancelToken;
 pub use crate::client::Client;
 pub use crate::config::Config;
@@ -134,7 +130,7 @@ pub use crate::generic_client::GenericClient;
 pub use crate::portal::Portal;
 pub use crate::query::RowStream;
 pub use crate::row::{Row, SimpleQueryRow};
-pub use crate::simple_query::SimpleQueryStream;
+pub use crate::simple_query::{SimpleQueryStream, SimpleColumn};
 #[cfg(feature = "runtime")]
 pub use crate::socket::Socket;
 pub use crate::statement::{Column, Statement};
@@ -145,6 +141,7 @@ pub use crate::to_statement::ToStatement;
 pub use crate::transaction::Transaction;
 pub use crate::transaction_builder::{IsolationLevel, TransactionBuilder};
 use crate::types::ToSql;
+use std::sync::Arc;
 
 pub mod binary_copy;
 mod bind;

From eec06021d9ebe1c1c2fcc47666a76ce257ae2891 Mon Sep 17 00:00:00 2001
From: Dane Rigby <me@danerigby.com>
Date: Tue, 28 May 2024 23:50:50 -0500
Subject: [PATCH 024/106] Clippy compliance

---
 tokio-postgres/src/simple_query.rs | 54 ++++++++++++++----------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/tokio-postgres/src/simple_query.rs b/tokio-postgres/src/simple_query.rs
index 4e0b7734d..e84806d36 100644
--- a/tokio-postgres/src/simple_query.rs
+++ b/tokio-postgres/src/simple_query.rs
@@ -85,36 +85,34 @@ impl Stream for SimpleQueryStream {
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let this = self.project();
-        loop {
-            match ready!(this.responses.poll_next(cx)?) {
-                Message::CommandComplete(body) => {
-                    let rows = extract_row_affected(&body)?;
-                    return Poll::Ready(Some(Ok(SimpleQueryMessage::CommandComplete(rows))));
-                }
-                Message::EmptyQueryResponse => {
-                    return Poll::Ready(Some(Ok(SimpleQueryMessage::CommandComplete(0))));
-                }
-                Message::RowDescription(body) => {
-                    let columns: Arc<[SimpleColumn]> = body
-                        .fields()
-                        .map(|f| Ok(SimpleColumn::new(f.name().to_string())))
-                        .collect::<Vec<_>>()
-                        .map_err(Error::parse)?
-                        .into();
+        match ready!(this.responses.poll_next(cx)?) {
+            Message::CommandComplete(body) => {
+                let rows = extract_row_affected(&body)?;
+                Poll::Ready(Some(Ok(SimpleQueryMessage::CommandComplete(rows))))
+            }
+            Message::EmptyQueryResponse => {
+                Poll::Ready(Some(Ok(SimpleQueryMessage::CommandComplete(0))))
+            }
+            Message::RowDescription(body) => {
+                let columns: Arc<[SimpleColumn]> = body
+                    .fields()
+                    .map(|f| Ok(SimpleColumn::new(f.name().to_string())))
+                    .collect::<Vec<_>>()
+                    .map_err(Error::parse)?
+                    .into();
 
-                    *this.columns = Some(columns.clone());
-                    return Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(columns.clone()))));
-                }
-                Message::DataRow(body) => {
-                    let row = match &this.columns {
-                        Some(columns) => SimpleQueryRow::new(columns.clone(), body)?,
-                        None => return Poll::Ready(Some(Err(Error::unexpected_message()))),
-                    };
-                    return Poll::Ready(Some(Ok(SimpleQueryMessage::Row(row))));
-                }
-                Message::ReadyForQuery(_) => return Poll::Ready(None),
-                _ => return Poll::Ready(Some(Err(Error::unexpected_message()))),
+                *this.columns = Some(columns.clone());
+                Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(columns.clone()))))
+            }
+            Message::DataRow(body) => {
+                let row = match &this.columns {
+                    Some(columns) => SimpleQueryRow::new(columns.clone(), body)?,
+                    None => return Poll::Ready(Some(Err(Error::unexpected_message()))),
+                };
+                Poll::Ready(Some(Ok(SimpleQueryMessage::Row(row))))
             }
+            Message::ReadyForQuery(_) => Poll::Ready(None),
+            _ => Poll::Ready(Some(Err(Error::unexpected_message()))),
         }
     }
 }

From bd6350c2fff2201d680a1814acf7a9208f4b7ad4 Mon Sep 17 00:00:00 2001
From: Dane Rigby <me@danerigby.com>
Date: Wed, 29 May 2024 23:32:18 -0500
Subject: [PATCH 025/106] Formatting

---
 tokio-postgres/src/lib.rs          | 4 ++--
 tokio-postgres/src/simple_query.rs | 4 +++-
 tokio-postgres/tests/test/main.rs  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs
index 6c6266736..a603158fb 100644
--- a/tokio-postgres/src/lib.rs
+++ b/tokio-postgres/src/lib.rs
@@ -130,7 +130,7 @@ pub use crate::generic_client::GenericClient;
 pub use crate::portal::Portal;
 pub use crate::query::RowStream;
 pub use crate::row::{Row, SimpleQueryRow};
-pub use crate::simple_query::{SimpleQueryStream, SimpleColumn};
+pub use crate::simple_query::{SimpleColumn, SimpleQueryStream};
 #[cfg(feature = "runtime")]
 pub use crate::socket::Socket;
 pub use crate::statement::{Column, Statement};
@@ -250,7 +250,7 @@ pub enum SimpleQueryMessage {
     /// The number of rows modified or selected is returned.
     CommandComplete(u64),
     /// Column values of the proceeding row values
-    RowDescription(Arc<[SimpleColumn]>)
+    RowDescription(Arc<[SimpleColumn]>),
 }
 
 fn slice_iter<'a>(
diff --git a/tokio-postgres/src/simple_query.rs b/tokio-postgres/src/simple_query.rs
index e84806d36..86af8e739 100644
--- a/tokio-postgres/src/simple_query.rs
+++ b/tokio-postgres/src/simple_query.rs
@@ -102,7 +102,9 @@ impl Stream for SimpleQueryStream {
                     .into();
 
                 *this.columns = Some(columns.clone());
-                Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(columns.clone()))))
+                Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(
+                    columns.clone(),
+                ))))
             }
             Message::DataRow(body) => {
                 let row = match &this.columns {
diff --git a/tokio-postgres/tests/test/main.rs b/tokio-postgres/tests/test/main.rs
index 4fa72aec9..e85960ab6 100644
--- a/tokio-postgres/tests/test/main.rs
+++ b/tokio-postgres/tests/test/main.rs
@@ -330,9 +330,9 @@ async fn simple_query() {
     match &messages[2] {
         SimpleQueryMessage::RowDescription(columns) => {
             assert_eq!(columns.get(0).map(|c| c.name()), Some("id"));
-            assert_eq!(columns.get(1).map(|c| c.name()), Some("name"));        
+            assert_eq!(columns.get(1).map(|c| c.name()), Some("name"));
         }
-        _ => panic!("unexpected message")
+        _ => panic!("unexpected message"),
     }
     match &messages[3] {
         SimpleQueryMessage::Row(row) => {

From f3976680c6d7004b04b3ba39f90f2956ce6d7010 Mon Sep 17 00:00:00 2001
From: Ramnivas Laddad <ramnivas@exograph.dev>
Date: Sun, 26 May 2024 11:05:00 -0700
Subject: [PATCH 026/106] Work with pools that don't support prepared
 statements

Introduce a new `query_with_param_types` method that allows to specify Postgres type parameters. This obviated the need to use prepared statementsjust to obtain parameter types for a query. It then combines parse, bind, and execute in a single packet.

Related: #1017, #1067
---
 tokio-postgres/src/client.rs         |  82 +++++++++++++++
 tokio-postgres/src/generic_client.rs |  46 +++++++++
 tokio-postgres/src/prepare.rs        |   2 +-
 tokio-postgres/src/query.rs          | 146 ++++++++++++++++++++++++++-
 tokio-postgres/src/statement.rs      |  13 +++
 tokio-postgres/src/transaction.rs    |  27 +++++
 tokio-postgres/tests/test/main.rs    | 106 +++++++++++++++++++
 7 files changed, 416 insertions(+), 6 deletions(-)

diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
index d48a23a60..431bfa792 100644
--- a/tokio-postgres/src/client.rs
+++ b/tokio-postgres/src/client.rs
@@ -364,6 +364,88 @@ impl Client {
         query::query(&self.inner, statement, params).await
     }
 
+    /// Like `query`, but requires the types of query parameters to be explicitly specified.
+    ///
+    /// Compared to `query`, this method allows performing queries without three round trips (for prepare, execute, and close). Thus,
+    /// this is suitable in environments where prepared statements aren't supported (such as Cloudflare Workers with Hyperdrive).
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// # async fn async_main(client: &tokio_postgres::Client) -> Result<(), tokio_postgres::Error> {
+    /// use tokio_postgres::types::ToSql;
+    /// use tokio_postgres::types::Type;
+    /// use futures_util::{pin_mut, TryStreamExt};
+    ///
+    /// let rows = client.query_with_param_types(
+    ///     "SELECT foo FROM bar WHERE biz = $1 AND baz = $2",
+    ///     &[(&"first param", Type::TEXT), (&2i32, Type::INT4)],
+    /// ).await?;
+    ///
+    /// for row in rows {
+    ///    let foo: i32 = row.get("foo");
+    ///    println!("foo: {}", foo);
+    /// }
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn query_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.query_raw_with_param_types(statement, params)
+            .await?
+            .try_collect()
+            .await
+    }
+
+    /// The maximally flexible version of [`query_with_param_types`].
+    ///
+    /// A statement may contain parameters, specified by `$n`, where `n` is the index of the parameter of the list
+    /// provided, 1-indexed.
+    ///
+    /// The parameters must specify value along with their Postgres type. This allows performing
+    /// queries without three round trips (for prepare, execute, and close).
+    ///
+    /// [`query_with_param_types`]: #method.query_with_param_types
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// # async fn async_main(client: &tokio_postgres::Client) -> Result<(), tokio_postgres::Error> {
+    /// use tokio_postgres::types::ToSql;
+    /// use tokio_postgres::types::Type;
+    /// use futures_util::{pin_mut, TryStreamExt};
+    ///
+    /// let mut it = client.query_raw_with_param_types(
+    ///     "SELECT foo FROM bar WHERE biz = $1 AND baz = $2",
+    ///     &[(&"first param", Type::TEXT), (&2i32, Type::INT4)],
+    /// ).await?;
+    ///
+    /// pin_mut!(it);
+    /// while let Some(row) = it.try_next().await? {
+    ///     let foo: i32 = row.get("foo");
+    ///     println!("foo: {}", foo);
+    /// }
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub async fn query_raw_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<RowStream, Error> {
+        fn slice_iter<'a>(
+            s: &'a [(&'a (dyn ToSql + Sync), Type)],
+        ) -> impl ExactSizeIterator<Item = (&'a dyn ToSql, Type)> + 'a {
+            s.iter()
+                .map(|(param, param_type)| (*param as _, param_type.clone()))
+        }
+
+        query::query_with_param_types(&self.inner, statement, slice_iter(params)).await
+    }
+
     /// Executes a statement, returning the number of rows modified.
     ///
     /// A statement may contain parameters, specified by `$n`, where `n` is the index of the parameter of the list
diff --git a/tokio-postgres/src/generic_client.rs b/tokio-postgres/src/generic_client.rs
index 50cff9712..3a0b09233 100644
--- a/tokio-postgres/src/generic_client.rs
+++ b/tokio-postgres/src/generic_client.rs
@@ -56,6 +56,20 @@ pub trait GenericClient: private::Sealed {
         I: IntoIterator<Item = P> + Sync + Send,
         I::IntoIter: ExactSizeIterator;
 
+    /// Like `Client::query_with_param_types`
+    async fn query_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error>;
+
+    /// Like `Client::query_raw_with_param_types`.
+    async fn query_raw_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<RowStream, Error>;
+
     /// Like `Client::prepare`.
     async fn prepare(&self, query: &str) -> Result<Statement, Error>;
 
@@ -136,6 +150,22 @@ impl GenericClient for Client {
         self.query_raw(statement, params).await
     }
 
+    async fn query_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.query_with_param_types(statement, params).await
+    }
+
+    async fn query_raw_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<RowStream, Error> {
+        self.query_raw_with_param_types(statement, params).await
+    }
+
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
         self.prepare(query).await
     }
@@ -222,6 +252,22 @@ impl GenericClient for Transaction<'_> {
         self.query_raw(statement, params).await
     }
 
+    async fn query_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.query_with_param_types(statement, params).await
+    }
+
+    async fn query_raw_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<RowStream, Error> {
+        self.query_raw_with_param_types(statement, params).await
+    }
+
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
         self.prepare(query).await
     }
diff --git a/tokio-postgres/src/prepare.rs b/tokio-postgres/src/prepare.rs
index 07fb45694..1d9bacb16 100644
--- a/tokio-postgres/src/prepare.rs
+++ b/tokio-postgres/src/prepare.rs
@@ -131,7 +131,7 @@ fn encode(client: &InnerClient, name: &str, query: &str, types: &[Type]) -> Resu
     })
 }
 
-async fn get_type(client: &Arc<InnerClient>, oid: Oid) -> Result<Type, Error> {
+pub(crate) async fn get_type(client: &Arc<InnerClient>, oid: Oid) -> Result<Type, Error> {
     if let Some(type_) = Type::from_oid(oid) {
         return Ok(type_);
     }
diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index e6e1d00a8..b9cc66405 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -1,17 +1,21 @@
 use crate::client::{InnerClient, Responses};
 use crate::codec::FrontendMessage;
 use crate::connection::RequestMessages;
+use crate::prepare::get_type;
 use crate::types::{BorrowToSql, IsNull};
-use crate::{Error, Portal, Row, Statement};
+use crate::{Column, Error, Portal, Row, Statement};
 use bytes::{Bytes, BytesMut};
+use fallible_iterator::FallibleIterator;
 use futures_util::{ready, Stream};
 use log::{debug, log_enabled, Level};
 use pin_project_lite::pin_project;
-use postgres_protocol::message::backend::{CommandCompleteBody, Message};
+use postgres_protocol::message::backend::{CommandCompleteBody, Message, RowDescriptionBody};
 use postgres_protocol::message::frontend;
+use postgres_types::Type;
 use std::fmt;
 use std::marker::PhantomPinned;
 use std::pin::Pin;
+use std::sync::Arc;
 use std::task::{Context, Poll};
 
 struct BorrowToSqlParamsDebug<'a, T>(&'a [T]);
@@ -50,13 +54,125 @@ where
     };
     let responses = start(client, buf).await?;
     Ok(RowStream {
-        statement,
+        statement: statement,
         responses,
         rows_affected: None,
         _p: PhantomPinned,
     })
 }
 
+enum QueryProcessingState {
+    Empty,
+    ParseCompleted,
+    BindCompleted,
+    ParameterDescribed,
+    Final(Vec<Column>),
+}
+
+/// State machine for processing messages for `query_with_param_types`.
+impl QueryProcessingState {
+    pub async fn process_message(
+        self,
+        client: &Arc<InnerClient>,
+        message: Message,
+    ) -> Result<Self, Error> {
+        match (self, message) {
+            (QueryProcessingState::Empty, Message::ParseComplete) => {
+                Ok(QueryProcessingState::ParseCompleted)
+            }
+            (QueryProcessingState::ParseCompleted, Message::BindComplete) => {
+                Ok(QueryProcessingState::BindCompleted)
+            }
+            (QueryProcessingState::BindCompleted, Message::ParameterDescription(_)) => {
+                Ok(QueryProcessingState::ParameterDescribed)
+            }
+            (
+                QueryProcessingState::ParameterDescribed,
+                Message::RowDescription(row_description),
+            ) => Self::form_final(client, Some(row_description)).await,
+            (QueryProcessingState::ParameterDescribed, Message::NoData) => {
+                Self::form_final(client, None).await
+            }
+            (_, Message::ErrorResponse(body)) => Err(Error::db(body)),
+            _ => Err(Error::unexpected_message()),
+        }
+    }
+
+    async fn form_final(
+        client: &Arc<InnerClient>,
+        row_description: Option<RowDescriptionBody>,
+    ) -> Result<Self, Error> {
+        let mut columns = vec![];
+        if let Some(row_description) = row_description {
+            let mut it = row_description.fields();
+            while let Some(field) = it.next().map_err(Error::parse)? {
+                let type_ = get_type(client, field.type_oid()).await?;
+                let column = Column {
+                    name: field.name().to_string(),
+                    table_oid: Some(field.table_oid()).filter(|n| *n != 0),
+                    column_id: Some(field.column_id()).filter(|n| *n != 0),
+                    r#type: type_,
+                };
+                columns.push(column);
+            }
+        }
+
+        Ok(Self::Final(columns))
+    }
+}
+
+pub async fn query_with_param_types<'a, P, I>(
+    client: &Arc<InnerClient>,
+    query: &str,
+    params: I,
+) -> Result<RowStream, Error>
+where
+    P: BorrowToSql,
+    I: IntoIterator<Item = (P, Type)>,
+    I::IntoIter: ExactSizeIterator,
+{
+    let (params, param_types): (Vec<_>, Vec<_>) = params.into_iter().unzip();
+
+    let params = params.into_iter();
+
+    let param_oids = param_types.iter().map(|t| t.oid()).collect::<Vec<_>>();
+
+    let params = params.into_iter();
+
+    let buf = client.with_buf(|buf| {
+        frontend::parse("", query, param_oids.into_iter(), buf).map_err(Error::parse)?;
+
+        encode_bind_with_statement_name_and_param_types("", &param_types, params, "", buf)?;
+
+        frontend::describe(b'S', "", buf).map_err(Error::encode)?;
+
+        frontend::execute("", 0, buf).map_err(Error::encode)?;
+
+        frontend::sync(buf);
+
+        Ok(buf.split().freeze())
+    })?;
+
+    let mut responses = client.send(RequestMessages::Single(FrontendMessage::Raw(buf)))?;
+
+    let mut state = QueryProcessingState::Empty;
+
+    loop {
+        let message = responses.next().await?;
+
+        state = state.process_message(client, message).await?;
+
+        if let QueryProcessingState::Final(columns) = state {
+            return Ok(RowStream {
+                statement: Statement::unnamed(vec![], columns),
+                responses,
+                rows_affected: None,
+                _p: PhantomPinned,
+            });
+        }
+    }
+}
+
 pub async fn query_portal(
     client: &InnerClient,
     portal: &Portal,
@@ -164,7 +280,27 @@ where
     I: IntoIterator<Item = P>,
     I::IntoIter: ExactSizeIterator,
 {
-    let param_types = statement.params();
+    encode_bind_with_statement_name_and_param_types(
+        statement.name(),
+        statement.params(),
+        params,
+        portal,
+        buf,
+    )
+}
+
+fn encode_bind_with_statement_name_and_param_types<P, I>(
+    statement_name: &str,
+    param_types: &[Type],
+    params: I,
+    portal: &str,
+    buf: &mut BytesMut,
+) -> Result<(), Error>
+where
+    P: BorrowToSql,
+    I: IntoIterator<Item = P>,
+    I::IntoIter: ExactSizeIterator,
+{
     let params = params.into_iter();
 
     if param_types.len() != params.len() {
@@ -181,7 +317,7 @@ where
     let mut error_idx = 0;
     let r = frontend::bind(
         portal,
-        statement.name(),
+        statement_name,
         param_formats,
         params.zip(param_types).enumerate(),
         |(idx, (param, ty)), buf| match param.borrow_to_sql().to_sql_checked(ty, buf) {
diff --git a/tokio-postgres/src/statement.rs b/tokio-postgres/src/statement.rs
index c5d657738..2b88ecd3b 100644
--- a/tokio-postgres/src/statement.rs
+++ b/tokio-postgres/src/statement.rs
@@ -14,6 +14,10 @@ struct StatementInner {
 
 impl Drop for StatementInner {
     fn drop(&mut self) {
+        if self.name.is_empty() {
+            // Unnamed statements don't need to be closed
+            return;
+        }
         if let Some(client) = self.client.upgrade() {
             let buf = client.with_buf(|buf| {
                 frontend::close(b'S', &self.name, buf).unwrap();
@@ -46,6 +50,15 @@ impl Statement {
         }))
     }
 
+    pub(crate) fn unnamed(params: Vec<Type>, columns: Vec<Column>) -> Statement {
+        Statement(Arc::new(StatementInner {
+            client: Weak::new(),
+            name: String::new(),
+            params,
+            columns,
+        }))
+    }
+
     pub(crate) fn name(&self) -> &str {
         &self.0.name
     }
diff --git a/tokio-postgres/src/transaction.rs b/tokio-postgres/src/transaction.rs
index 96a324652..5a6094b56 100644
--- a/tokio-postgres/src/transaction.rs
+++ b/tokio-postgres/src/transaction.rs
@@ -227,6 +227,33 @@ impl<'a> Transaction<'a> {
         query::query_portal(self.client.inner(), portal, max_rows).await
     }
 
+    /// Like `Client::query_with_param_types`.
+    pub async fn query_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.query_raw_with_param_types(statement, params)
+            .await?
+            .try_collect()
+            .await
+    }
+
+    /// Like `Client::query_raw_with_param_types`.
+    pub async fn query_raw_with_param_types(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<RowStream, Error> {
+        fn slice_iter<'a>(
+            s: &'a [(&'a (dyn ToSql + Sync), Type)],
+        ) -> impl ExactSizeIterator<Item = (&'a dyn ToSql, Type)> + 'a {
+            s.iter()
+                .map(|(param, param_type)| (*param as _, param_type.clone()))
+        }
+        query::query_with_param_types(self.client.inner(), statement, slice_iter(params)).await
+    }
+
     /// Like `Client::copy_in`.
     pub async fn copy_in<T, U>(&self, statement: &T) -> Result<CopyInSink<U>, Error>
     where
diff --git a/tokio-postgres/tests/test/main.rs b/tokio-postgres/tests/test/main.rs
index 737f46631..925c99206 100644
--- a/tokio-postgres/tests/test/main.rs
+++ b/tokio-postgres/tests/test/main.rs
@@ -952,3 +952,109 @@ async fn deferred_constraint() {
         .await
         .unwrap_err();
 }
+
+#[tokio::test]
+async fn query_with_param_types_no_transaction() {
+    let client = connect("user=postgres").await;
+
+    client
+        .batch_execute(
+            "
+            CREATE TEMPORARY TABLE foo (
+                name TEXT,
+                age INT
+            );
+            INSERT INTO foo (name, age) VALUES ('alice', 20), ('bob', 30), ('carol', 40);
+        ",
+        )
+        .await
+        .unwrap();
+
+    let rows: Vec<tokio_postgres::Row> = client
+        .query_with_param_types(
+            "SELECT name, age, 'literal', 5 FROM foo WHERE name <> $1 AND age < $2 ORDER BY age",
+            &[(&"alice", Type::TEXT), (&50i32, Type::INT4)],
+        )
+        .await
+        .unwrap();
+
+    assert_eq!(rows.len(), 2);
+    let first_row = &rows[0];
+    assert_eq!(first_row.get::<_, &str>(0), "bob");
+    assert_eq!(first_row.get::<_, i32>(1), 30);
+    assert_eq!(first_row.get::<_, &str>(2), "literal");
+    assert_eq!(first_row.get::<_, i32>(3), 5);
+
+    let second_row = &rows[1];
+    assert_eq!(second_row.get::<_, &str>(0), "carol");
+    assert_eq!(second_row.get::<_, i32>(1), 40);
+    assert_eq!(second_row.get::<_, &str>(2), "literal");
+    assert_eq!(second_row.get::<_, i32>(3), 5);
+}
+
+#[tokio::test]
+async fn query_with_param_types_with_transaction() {
+    let mut client = connect("user=postgres").await;
+
+    client
+        .batch_execute(
+            "
+            CREATE TEMPORARY TABLE foo (
+                name TEXT,
+                age INT
+            );
+        ",
+        )
+        .await
+        .unwrap();
+
+    let transaction = client.transaction().await.unwrap();
+
+    let rows: Vec<tokio_postgres::Row> = transaction
+        .query_with_param_types(
+            "INSERT INTO foo (name, age) VALUES ($1, $2), ($3, $4), ($5, $6) returning name, age",
+            &[
+                (&"alice", Type::TEXT),
+                (&20i32, Type::INT4),
+                (&"bob", Type::TEXT),
+                (&30i32, Type::INT4),
+                (&"carol", Type::TEXT),
+                (&40i32, Type::INT4),
+            ],
+        )
+        .await
+        .unwrap();
+    let inserted_values: Vec<(String, i32)> = rows
+        .iter()
+        .map(|row| (row.get::<_, String>(0), row.get::<_, i32>(1)))
+        .collect();
+    assert_eq!(
+        inserted_values,
+        [
+            ("alice".to_string(), 20),
+            ("bob".to_string(), 30),
+            ("carol".to_string(), 40)
+        ]
+    );
+
+    let rows: Vec<tokio_postgres::Row> = transaction
+        .query_with_param_types(
+            "SELECT name, age, 'literal', 5 FROM foo WHERE name <> $1 AND age < $2 ORDER BY age",
+            &[(&"alice", Type::TEXT), (&50i32, Type::INT4)],
+        )
+        .await
+        .unwrap();
+
+    assert_eq!(rows.len(), 2);
+    let first_row = &rows[0];
+    assert_eq!(first_row.get::<_, &str>(0), "bob");
+    assert_eq!(first_row.get::<_, i32>(1), 30);
+    assert_eq!(first_row.get::<_, &str>(2), "literal");
+    assert_eq!(first_row.get::<_, i32>(3), 5);
+
+    let second_row = &rows[1];
+    assert_eq!(second_row.get::<_, &str>(0), "carol");
+    assert_eq!(second_row.get::<_, i32>(1), 40);
+    assert_eq!(second_row.get::<_, &str>(2), "literal");
+    assert_eq!(second_row.get::<_, i32>(3), 5);
+}

From 84994dad1aa9c3ef5c813b95c86c80dbfa4b7f0d Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Sat, 6 Jul 2024 11:23:26 -0400
Subject: [PATCH 027/106] Derive Clone for Row

---
 postgres-protocol/src/message/backend.rs | 2 +-
 tokio-postgres/src/row.rs                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/postgres-protocol/src/message/backend.rs b/postgres-protocol/src/message/backend.rs
index 1b5be1098..c4439b26a 100644
--- a/postgres-protocol/src/message/backend.rs
+++ b/postgres-protocol/src/message/backend.rs
@@ -524,7 +524,7 @@ impl CopyOutResponseBody {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct DataRowBody {
     storage: Bytes,
     len: u16,
diff --git a/tokio-postgres/src/row.rs b/tokio-postgres/src/row.rs
index 3c79de603..767c26921 100644
--- a/tokio-postgres/src/row.rs
+++ b/tokio-postgres/src/row.rs
@@ -95,6 +95,7 @@ where
 }
 
 /// A row of data returned from the database by a query.
+#[derive(Clone)]
 pub struct Row {
     statement: Statement,
     body: DataRowBody,

From 2b1949dd2f8745fcfaefe4b5e228684c25997265 Mon Sep 17 00:00:00 2001
From: Sidney Cammeresi <sac@cheesecake.org>
Date: Sat, 6 Jul 2024 11:00:41 -0700
Subject: [PATCH 028/106] impl Debug for Statement

The lack of this common trait bound caused some unpleasantness.
For example, the following didn't compile:

let x = OnceLock::new();
let stmt = db.prepare(...)?;
x.set(stmt).expect(...); // returns Result<(), T=Statement> where T: Debug
---
 tokio-postgres/src/statement.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tokio-postgres/src/statement.rs b/tokio-postgres/src/statement.rs
index c5d657738..4955d3b41 100644
--- a/tokio-postgres/src/statement.rs
+++ b/tokio-postgres/src/statement.rs
@@ -61,6 +61,16 @@ impl Statement {
     }
 }
 
+impl std::fmt::Debug for Statement {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        f.debug_struct("Statement")
+            .field("name", &self.0.name)
+            .field("params", &self.0.params)
+            .field("columns", &self.0.columns)
+            .finish_non_exhaustive()
+    }
+}
+
 /// Information about a column of a query.
 #[derive(Debug)]
 pub struct Column {

From 1f312194928c5a385d51d52e5d13ca59d3dc1b43 Mon Sep 17 00:00:00 2001
From: Sidney Cammeresi <sac@cheesecake.org>
Date: Sat, 6 Jul 2024 12:29:09 -0700
Subject: [PATCH 029/106] Fix a few nits pointed out by clippy

- ...::max_value() -> ..::MAX
- delete explicit import of signed integer types
---
 postgres-protocol/src/lib.rs  | 2 +-
 postgres-types/src/lib.rs     | 2 +-
 postgres-types/src/special.rs | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/postgres-protocol/src/lib.rs b/postgres-protocol/src/lib.rs
index 83d9bf55c..e0de3b6c6 100644
--- a/postgres-protocol/src/lib.rs
+++ b/postgres-protocol/src/lib.rs
@@ -60,7 +60,7 @@ macro_rules! from_usize {
         impl FromUsize for $t {
             #[inline]
             fn from_usize(x: usize) -> io::Result<$t> {
-                if x > <$t>::max_value() as usize {
+                if x > <$t>::MAX as usize {
                     Err(io::Error::new(
                         io::ErrorKind::InvalidInput,
                         "value too large to transmit",
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 2f02f6e5f..492039766 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -1222,7 +1222,7 @@ impl ToSql for IpAddr {
 }
 
 fn downcast(len: usize) -> Result<i32, Box<dyn Error + Sync + Send>> {
-    if len > i32::max_value() as usize {
+    if len > i32::MAX as usize {
         Err("value too large to transmit".into())
     } else {
         Ok(len as i32)
diff --git a/postgres-types/src/special.rs b/postgres-types/src/special.rs
index 1a865287e..d8541bf0e 100644
--- a/postgres-types/src/special.rs
+++ b/postgres-types/src/special.rs
@@ -1,7 +1,6 @@
 use bytes::BytesMut;
 use postgres_protocol::types;
 use std::error::Error;
-use std::{i32, i64};
 
 use crate::{FromSql, IsNull, ToSql, Type};
 

From 263b0068af39072bc7be05b6500e47f263cbd43e Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 6 Jul 2024 19:21:37 -0400
Subject: [PATCH 030/106] Handle non-UTF8 error fields

---
 postgres-protocol/src/message/backend.rs | 10 +++++--
 tokio-postgres/src/error/mod.rs          | 37 ++++++++++++------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/postgres-protocol/src/message/backend.rs b/postgres-protocol/src/message/backend.rs
index c4439b26a..73b169288 100644
--- a/postgres-protocol/src/message/backend.rs
+++ b/postgres-protocol/src/message/backend.rs
@@ -633,7 +633,7 @@ impl<'a> FallibleIterator for ErrorFields<'a> {
         }
 
         let value_end = find_null(self.buf, 0)?;
-        let value = get_str(&self.buf[..value_end])?;
+        let value = &self.buf[..value_end];
         self.buf = &self.buf[value_end + 1..];
 
         Ok(Some(ErrorField { type_, value }))
@@ -642,7 +642,7 @@ impl<'a> FallibleIterator for ErrorFields<'a> {
 
 pub struct ErrorField<'a> {
     type_: u8,
-    value: &'a str,
+    value: &'a [u8],
 }
 
 impl<'a> ErrorField<'a> {
@@ -652,7 +652,13 @@ impl<'a> ErrorField<'a> {
     }
 
     #[inline]
+    #[deprecated(note = "use value_bytes instead", since = "0.6.7")]
     pub fn value(&self) -> &str {
+        str::from_utf8(self.value).expect("error field value contained non-UTF8 bytes")
+    }
+
+    #[inline]
+    pub fn value_bytes(&self) -> &[u8] {
         self.value
     }
 }
diff --git a/tokio-postgres/src/error/mod.rs b/tokio-postgres/src/error/mod.rs
index f1e2644c6..75664d258 100644
--- a/tokio-postgres/src/error/mod.rs
+++ b/tokio-postgres/src/error/mod.rs
@@ -107,14 +107,15 @@ impl DbError {
         let mut routine = None;
 
         while let Some(field) = fields.next()? {
+            let value = String::from_utf8_lossy(field.value_bytes());
             match field.type_() {
-                b'S' => severity = Some(field.value().to_owned()),
-                b'C' => code = Some(SqlState::from_code(field.value())),
-                b'M' => message = Some(field.value().to_owned()),
-                b'D' => detail = Some(field.value().to_owned()),
-                b'H' => hint = Some(field.value().to_owned()),
+                b'S' => severity = Some(value.into_owned()),
+                b'C' => code = Some(SqlState::from_code(&value)),
+                b'M' => message = Some(value.into_owned()),
+                b'D' => detail = Some(value.into_owned()),
+                b'H' => hint = Some(value.into_owned()),
                 b'P' => {
-                    normal_position = Some(field.value().parse::<u32>().map_err(|_| {
+                    normal_position = Some(value.parse::<u32>().map_err(|_| {
                         io::Error::new(
                             io::ErrorKind::InvalidInput,
                             "`P` field did not contain an integer",
@@ -122,32 +123,32 @@ impl DbError {
                     })?);
                 }
                 b'p' => {
-                    internal_position = Some(field.value().parse::<u32>().map_err(|_| {
+                    internal_position = Some(value.parse::<u32>().map_err(|_| {
                         io::Error::new(
                             io::ErrorKind::InvalidInput,
                             "`p` field did not contain an integer",
                         )
                     })?);
                 }
-                b'q' => internal_query = Some(field.value().to_owned()),
-                b'W' => where_ = Some(field.value().to_owned()),
-                b's' => schema = Some(field.value().to_owned()),
-                b't' => table = Some(field.value().to_owned()),
-                b'c' => column = Some(field.value().to_owned()),
-                b'd' => datatype = Some(field.value().to_owned()),
-                b'n' => constraint = Some(field.value().to_owned()),
-                b'F' => file = Some(field.value().to_owned()),
+                b'q' => internal_query = Some(value.into_owned()),
+                b'W' => where_ = Some(value.into_owned()),
+                b's' => schema = Some(value.into_owned()),
+                b't' => table = Some(value.into_owned()),
+                b'c' => column = Some(value.into_owned()),
+                b'd' => datatype = Some(value.into_owned()),
+                b'n' => constraint = Some(value.into_owned()),
+                b'F' => file = Some(value.into_owned()),
                 b'L' => {
-                    line = Some(field.value().parse::<u32>().map_err(|_| {
+                    line = Some(value.parse::<u32>().map_err(|_| {
                         io::Error::new(
                             io::ErrorKind::InvalidInput,
                             "`L` field did not contain an integer",
                         )
                     })?);
                 }
-                b'R' => routine = Some(field.value().to_owned()),
+                b'R' => routine = Some(value.into_owned()),
                 b'V' => {
-                    parsed_severity = Some(Severity::from_str(field.value()).ok_or_else(|| {
+                    parsed_severity = Some(Severity::from_str(&value).ok_or_else(|| {
                         io::Error::new(
                             io::ErrorKind::InvalidInput,
                             "`V` field contained an invalid value",

From cfd91632be877543a7e19e7a05816ed5d241b559 Mon Sep 17 00:00:00 2001
From: Dane Rigby <me@danerigby.com>
Date: Sun, 7 Jul 2024 13:56:35 -0500
Subject: [PATCH 031/106] PR Fix: Only use single clone for RowDescription

---
 tokio-postgres/src/simple_query.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tokio-postgres/src/simple_query.rs b/tokio-postgres/src/simple_query.rs
index 86af8e739..b6500260e 100644
--- a/tokio-postgres/src/simple_query.rs
+++ b/tokio-postgres/src/simple_query.rs
@@ -101,9 +101,9 @@ impl Stream for SimpleQueryStream {
                     .map_err(Error::parse)?
                     .into();
 
-                *this.columns = Some(columns.clone());
+                *this.columns = Some(columns);
                 Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(
-                    columns.clone(),
+                    this.columns.as_ref().unwrap().clone(),
                 ))))
             }
             Message::DataRow(body) => {

From 3f8f5ded337a0122959f6e4a3dc9343bf6c6ee70 Mon Sep 17 00:00:00 2001
From: Ramnivas Laddad <ramnivas@exograph.dev>
Date: Sun, 7 Jul 2024 16:21:40 -0700
Subject: [PATCH 032/106] Replace the state machine to process messages with a
 direct match statements

---
 tokio-postgres/src/query.rs | 101 ++++++++++--------------------------
 1 file changed, 27 insertions(+), 74 deletions(-)

diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index b9cc66405..2bdfa14cc 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -9,7 +9,7 @@ use fallible_iterator::FallibleIterator;
 use futures_util::{ready, Stream};
 use log::{debug, log_enabled, Level};
 use pin_project_lite::pin_project;
-use postgres_protocol::message::backend::{CommandCompleteBody, Message, RowDescriptionBody};
+use postgres_protocol::message::backend::{CommandCompleteBody, Message};
 use postgres_protocol::message::frontend;
 use postgres_types::Type;
 use std::fmt;
@@ -61,66 +61,6 @@ where
     })
 }
 
-enum QueryProcessingState {
-    Empty,
-    ParseCompleted,
-    BindCompleted,
-    ParameterDescribed,
-    Final(Vec<Column>),
-}
-
-/// State machine for processing messages for `query_with_param_types`.
-impl QueryProcessingState {
-    pub async fn process_message(
-        self,
-        client: &Arc<InnerClient>,
-        message: Message,
-    ) -> Result<Self, Error> {
-        match (self, message) {
-            (QueryProcessingState::Empty, Message::ParseComplete) => {
-                Ok(QueryProcessingState::ParseCompleted)
-            }
-            (QueryProcessingState::ParseCompleted, Message::BindComplete) => {
-                Ok(QueryProcessingState::BindCompleted)
-            }
-            (QueryProcessingState::BindCompleted, Message::ParameterDescription(_)) => {
-                Ok(QueryProcessingState::ParameterDescribed)
-            }
-            (
-                QueryProcessingState::ParameterDescribed,
-                Message::RowDescription(row_description),
-            ) => Self::form_final(client, Some(row_description)).await,
-            (QueryProcessingState::ParameterDescribed, Message::NoData) => {
-                Self::form_final(client, None).await
-            }
-            (_, Message::ErrorResponse(body)) => Err(Error::db(body)),
-            _ => Err(Error::unexpected_message()),
-        }
-    }
-
-    async fn form_final(
-        client: &Arc<InnerClient>,
-        row_description: Option<RowDescriptionBody>,
-    ) -> Result<Self, Error> {
-        let mut columns = vec![];
-        if let Some(row_description) = row_description {
-            let mut it = row_description.fields();
-            while let Some(field) = it.next().map_err(Error::parse)? {
-                let type_ = get_type(client, field.type_oid()).await?;
-                let column = Column {
-                    name: field.name().to_string(),
-                    table_oid: Some(field.table_oid()).filter(|n| *n != 0),
-                    column_id: Some(field.column_id()).filter(|n| *n != 0),
-                    r#type: type_,
-                };
-                columns.push(column);
-            }
-        }
-
-        Ok(Self::Final(columns))
-    }
-}
-
 pub async fn query_with_param_types<'a, P, I>(
     client: &Arc<InnerClient>,
     query: &str,
@@ -155,20 +95,33 @@ where
 
     let mut responses = client.send(RequestMessages::Single(FrontendMessage::Raw(buf)))?;
 
-    let mut state = QueryProcessingState::Empty;
-
     loop {
-        let message = responses.next().await?;
-
-        state = state.process_message(client, message).await?;
-
-        if let QueryProcessingState::Final(columns) = state {
-            return Ok(RowStream {
-                statement: Statement::unnamed(vec![], columns),
-                responses,
-                rows_affected: None,
-                _p: PhantomPinned,
-            });
+        match responses.next().await? {
+            Message::ParseComplete
+            | Message::BindComplete
+            | Message::ParameterDescription(_)
+            | Message::NoData => {}
+            Message::RowDescription(row_description) => {
+                let mut columns: Vec<Column> = vec![];
+                let mut it = row_description.fields();
+                while let Some(field) = it.next().map_err(Error::parse)? {
+                    let type_ = get_type(client, field.type_oid()).await?;
+                    let column = Column {
+                        name: field.name().to_string(),
+                        table_oid: Some(field.table_oid()).filter(|n| *n != 0),
+                        column_id: Some(field.column_id()).filter(|n| *n != 0),
+                        r#type: type_,
+                    };
+                    columns.push(column);
+                }
+                return Ok(RowStream {
+                    statement: Statement::unnamed(vec![], columns),
+                    responses,
+                    rows_affected: None,
+                    _p: PhantomPinned,
+                });
+            }
+            _ => return Err(Error::unexpected_message()),
         }
     }
 }

From 74eb4dbf7399cb96500f2b60a2b838805471a26a Mon Sep 17 00:00:00 2001
From: Ramnivas Laddad <ramnivas@exograph.dev>
Date: Sun, 7 Jul 2024 16:43:41 -0700
Subject: [PATCH 033/106] Remove query_raw_with_param_types as per PR feedback

---
 tokio-postgres/src/client.rs         | 56 ++++++----------------------
 tokio-postgres/src/generic_client.rs | 23 ------------
 tokio-postgres/src/transaction.rs    | 20 +---------
 3 files changed, 12 insertions(+), 87 deletions(-)

diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
index 431bfa792..e420bcf2f 100644
--- a/tokio-postgres/src/client.rs
+++ b/tokio-postgres/src/client.rs
@@ -366,8 +366,13 @@ impl Client {
 
     /// Like `query`, but requires the types of query parameters to be explicitly specified.
     ///
-    /// Compared to `query`, this method allows performing queries without three round trips (for prepare, execute, and close). Thus,
-    /// this is suitable in environments where prepared statements aren't supported (such as Cloudflare Workers with Hyperdrive).
+    /// Compared to `query`, this method allows performing queries without three round trips (for
+    /// prepare, execute, and close) by requiring the caller to specify parameter values along with
+    /// their Postgres type. Thus, this is suitable in environments where prepared statements aren't
+    /// supported (such as Cloudflare Workers with Hyperdrive).
+    ///
+    /// A statement may contain parameters, specified by `$n`, where `n` is the index of the
+    /// parameter of the list provided, 1-indexed.
     ///
     /// # Examples
     ///
@@ -394,48 +399,6 @@ impl Client {
         statement: &str,
         params: &[(&(dyn ToSql + Sync), Type)],
     ) -> Result<Vec<Row>, Error> {
-        self.query_raw_with_param_types(statement, params)
-            .await?
-            .try_collect()
-            .await
-    }
-
-    /// The maximally flexible version of [`query_with_param_types`].
-    ///
-    /// A statement may contain parameters, specified by `$n`, where `n` is the index of the parameter of the list
-    /// provided, 1-indexed.
-    ///
-    /// The parameters must specify value along with their Postgres type. This allows performing
-    /// queries without three round trips (for prepare, execute, and close).
-    ///
-    /// [`query_with_param_types`]: #method.query_with_param_types
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// # async fn async_main(client: &tokio_postgres::Client) -> Result<(), tokio_postgres::Error> {
-    /// use tokio_postgres::types::ToSql;
-    /// use tokio_postgres::types::Type;
-    /// use futures_util::{pin_mut, TryStreamExt};
-    ///
-    /// let mut it = client.query_raw_with_param_types(
-    ///     "SELECT foo FROM bar WHERE biz = $1 AND baz = $2",
-    ///     &[(&"first param", Type::TEXT), (&2i32, Type::INT4)],
-    /// ).await?;
-    ///
-    /// pin_mut!(it);
-    /// while let Some(row) = it.try_next().await? {
-    ///     let foo: i32 = row.get("foo");
-    ///     println!("foo: {}", foo);
-    /// }
-    /// # Ok(())
-    /// # }
-    /// ```
-    pub async fn query_raw_with_param_types(
-        &self,
-        statement: &str,
-        params: &[(&(dyn ToSql + Sync), Type)],
-    ) -> Result<RowStream, Error> {
         fn slice_iter<'a>(
             s: &'a [(&'a (dyn ToSql + Sync), Type)],
         ) -> impl ExactSizeIterator<Item = (&'a dyn ToSql, Type)> + 'a {
@@ -443,7 +406,10 @@ impl Client {
                 .map(|(param, param_type)| (*param as _, param_type.clone()))
         }
 
-        query::query_with_param_types(&self.inner, statement, slice_iter(params)).await
+        query::query_with_param_types(&self.inner, statement, slice_iter(params))
+            .await?
+            .try_collect()
+            .await
     }
 
     /// Executes a statement, returning the number of rows modified.
diff --git a/tokio-postgres/src/generic_client.rs b/tokio-postgres/src/generic_client.rs
index 3a0b09233..b892015dc 100644
--- a/tokio-postgres/src/generic_client.rs
+++ b/tokio-postgres/src/generic_client.rs
@@ -63,13 +63,6 @@ pub trait GenericClient: private::Sealed {
         params: &[(&(dyn ToSql + Sync), Type)],
     ) -> Result<Vec<Row>, Error>;
 
-    /// Like `Client::query_raw_with_param_types`.
-    async fn query_raw_with_param_types(
-        &self,
-        statement: &str,
-        params: &[(&(dyn ToSql + Sync), Type)],
-    ) -> Result<RowStream, Error>;
-
     /// Like `Client::prepare`.
     async fn prepare(&self, query: &str) -> Result<Statement, Error>;
 
@@ -158,14 +151,6 @@ impl GenericClient for Client {
         self.query_with_param_types(statement, params).await
     }
 
-    async fn query_raw_with_param_types(
-        &self,
-        statement: &str,
-        params: &[(&(dyn ToSql + Sync), Type)],
-    ) -> Result<RowStream, Error> {
-        self.query_raw_with_param_types(statement, params).await
-    }
-
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
         self.prepare(query).await
     }
@@ -260,14 +245,6 @@ impl GenericClient for Transaction<'_> {
         self.query_with_param_types(statement, params).await
     }
 
-    async fn query_raw_with_param_types(
-        &self,
-        statement: &str,
-        params: &[(&(dyn ToSql + Sync), Type)],
-    ) -> Result<RowStream, Error> {
-        self.query_raw_with_param_types(statement, params).await
-    }
-
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
         self.prepare(query).await
     }
diff --git a/tokio-postgres/src/transaction.rs b/tokio-postgres/src/transaction.rs
index 5a6094b56..8a0ad2224 100644
--- a/tokio-postgres/src/transaction.rs
+++ b/tokio-postgres/src/transaction.rs
@@ -233,25 +233,7 @@ impl<'a> Transaction<'a> {
         statement: &str,
         params: &[(&(dyn ToSql + Sync), Type)],
     ) -> Result<Vec<Row>, Error> {
-        self.query_raw_with_param_types(statement, params)
-            .await?
-            .try_collect()
-            .await
-    }
-
-    /// Like `Client::query_raw_with_param_types`.
-    pub async fn query_raw_with_param_types(
-        &self,
-        statement: &str,
-        params: &[(&(dyn ToSql + Sync), Type)],
-    ) -> Result<RowStream, Error> {
-        fn slice_iter<'a>(
-            s: &'a [(&'a (dyn ToSql + Sync), Type)],
-        ) -> impl ExactSizeIterator<Item = (&'a dyn ToSql, Type)> + 'a {
-            s.iter()
-                .map(|(param, param_type)| (*param as _, param_type.clone()))
-        }
-        query::query_with_param_types(self.client.inner(), statement, slice_iter(params)).await
+        self.client.query_with_param_types(statement, params).await
     }
 
     /// Like `Client::copy_in`.

From 2647024c660ca27701898325a8772b83bece4982 Mon Sep 17 00:00:00 2001
From: Dane Rigby <me@danerigby.com>
Date: Sun, 7 Jul 2024 21:30:23 -0500
Subject: [PATCH 034/106] PR Fix: Clone first then move

---
 tokio-postgres/src/simple_query.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tokio-postgres/src/simple_query.rs b/tokio-postgres/src/simple_query.rs
index b6500260e..24473b896 100644
--- a/tokio-postgres/src/simple_query.rs
+++ b/tokio-postgres/src/simple_query.rs
@@ -101,10 +101,8 @@ impl Stream for SimpleQueryStream {
                     .map_err(Error::parse)?
                     .into();
 
-                *this.columns = Some(columns);
-                Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(
-                    this.columns.as_ref().unwrap().clone(),
-                ))))
+                *this.columns = Some(columns.clone());
+                Poll::Ready(Some(Ok(SimpleQueryMessage::RowDescription(columns))))
             }
             Message::DataRow(body) => {
                 let row = match &this.columns {

From dbd4d02e2f3a367b949e356e9dda40c08272d954 Mon Sep 17 00:00:00 2001
From: Ramnivas Laddad <ramnivas@exograph.dev>
Date: Mon, 8 Jul 2024 17:21:32 -0700
Subject: [PATCH 035/106] Address review comment to rename
 query_with_param_types to query_typed

---
 tokio-postgres/src/client.rs         |  6 +++---
 tokio-postgres/src/generic_client.rs | 12 ++++++------
 tokio-postgres/src/query.rs          |  2 +-
 tokio-postgres/src/transaction.rs    |  6 +++---
 tokio-postgres/tests/test/main.rs    | 10 +++++-----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
index e420bcf2f..2b29351a5 100644
--- a/tokio-postgres/src/client.rs
+++ b/tokio-postgres/src/client.rs
@@ -382,7 +382,7 @@ impl Client {
     /// use tokio_postgres::types::Type;
     /// use futures_util::{pin_mut, TryStreamExt};
     ///
-    /// let rows = client.query_with_param_types(
+    /// let rows = client.query_typed(
     ///     "SELECT foo FROM bar WHERE biz = $1 AND baz = $2",
     ///     &[(&"first param", Type::TEXT), (&2i32, Type::INT4)],
     /// ).await?;
@@ -394,7 +394,7 @@ impl Client {
     /// # Ok(())
     /// # }
     /// ```
-    pub async fn query_with_param_types(
+    pub async fn query_typed(
         &self,
         statement: &str,
         params: &[(&(dyn ToSql + Sync), Type)],
@@ -406,7 +406,7 @@ impl Client {
                 .map(|(param, param_type)| (*param as _, param_type.clone()))
         }
 
-        query::query_with_param_types(&self.inner, statement, slice_iter(params))
+        query::query_typed(&self.inner, statement, slice_iter(params))
             .await?
             .try_collect()
             .await
diff --git a/tokio-postgres/src/generic_client.rs b/tokio-postgres/src/generic_client.rs
index e43bddfea..b91d78064 100644
--- a/tokio-postgres/src/generic_client.rs
+++ b/tokio-postgres/src/generic_client.rs
@@ -56,8 +56,8 @@ pub trait GenericClient: private::Sealed {
         I: IntoIterator<Item = P> + Sync + Send,
         I::IntoIter: ExactSizeIterator;
 
-    /// Like [`Client::query_with_param_types`]
-    async fn query_with_param_types(
+    /// Like [`Client::query_typed`]
+    async fn query_typed(
         &self,
         statement: &str,
         params: &[(&(dyn ToSql + Sync), Type)],
@@ -146,12 +146,12 @@ impl GenericClient for Client {
         self.query_raw(statement, params).await
     }
 
-    async fn query_with_param_types(
+    async fn query_typed(
         &self,
         statement: &str,
         params: &[(&(dyn ToSql + Sync), Type)],
     ) -> Result<Vec<Row>, Error> {
-        self.query_with_param_types(statement, params).await
+        self.query_typed(statement, params).await
     }
 
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
@@ -244,12 +244,12 @@ impl GenericClient for Transaction<'_> {
         self.query_raw(statement, params).await
     }
 
-    async fn query_with_param_types(
+    async fn query_typed(
         &self,
         statement: &str,
         params: &[(&(dyn ToSql + Sync), Type)],
     ) -> Result<Vec<Row>, Error> {
-        self.query_with_param_types(statement, params).await
+        self.query_typed(statement, params).await
     }
 
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index 2bdfa14cc..b54e095df 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -61,7 +61,7 @@ where
     })
 }
 
-pub async fn query_with_param_types<'a, P, I>(
+pub async fn query_typed<'a, P, I>(
     client: &Arc<InnerClient>,
     query: &str,
     params: I,
diff --git a/tokio-postgres/src/transaction.rs b/tokio-postgres/src/transaction.rs
index 8a0ad2224..3e62b2ac7 100644
--- a/tokio-postgres/src/transaction.rs
+++ b/tokio-postgres/src/transaction.rs
@@ -227,13 +227,13 @@ impl<'a> Transaction<'a> {
         query::query_portal(self.client.inner(), portal, max_rows).await
     }
 
-    /// Like `Client::query_with_param_types`.
-    pub async fn query_with_param_types(
+    /// Like `Client::query_typed`.
+    pub async fn query_typed(
         &self,
         statement: &str,
         params: &[(&(dyn ToSql + Sync), Type)],
     ) -> Result<Vec<Row>, Error> {
-        self.client.query_with_param_types(statement, params).await
+        self.client.query_typed(statement, params).await
     }
 
     /// Like `Client::copy_in`.
diff --git a/tokio-postgres/tests/test/main.rs b/tokio-postgres/tests/test/main.rs
index 925c99206..7ddb7a36a 100644
--- a/tokio-postgres/tests/test/main.rs
+++ b/tokio-postgres/tests/test/main.rs
@@ -954,7 +954,7 @@ async fn deferred_constraint() {
 }
 
 #[tokio::test]
-async fn query_with_param_types_no_transaction() {
+async fn query_typed_no_transaction() {
     let client = connect("user=postgres").await;
 
     client
@@ -971,7 +971,7 @@ async fn query_with_param_types_no_transaction() {
         .unwrap();
 
     let rows: Vec<tokio_postgres::Row> = client
-        .query_with_param_types(
+        .query_typed(
             "SELECT name, age, 'literal', 5 FROM foo WHERE name <> $1 AND age < $2 ORDER BY age",
             &[(&"alice", Type::TEXT), (&50i32, Type::INT4)],
         )
@@ -993,7 +993,7 @@ async fn query_with_param_types_no_transaction() {
 }
 
 #[tokio::test]
-async fn query_with_param_types_with_transaction() {
+async fn query_typed_with_transaction() {
     let mut client = connect("user=postgres").await;
 
     client
@@ -1011,7 +1011,7 @@ async fn query_with_param_types_with_transaction() {
     let transaction = client.transaction().await.unwrap();
 
     let rows: Vec<tokio_postgres::Row> = transaction
-        .query_with_param_types(
+        .query_typed(
             "INSERT INTO foo (name, age) VALUES ($1, $2), ($3, $4), ($5, $6) returning name, age",
             &[
                 (&"alice", Type::TEXT),
@@ -1038,7 +1038,7 @@ async fn query_with_param_types_with_transaction() {
     );
 
     let rows: Vec<tokio_postgres::Row> = transaction
-        .query_with_param_types(
+        .query_typed(
             "SELECT name, age, 'literal', 5 FROM foo WHERE name <> $1 AND age < $2 ORDER BY age",
             &[(&"alice", Type::TEXT), (&50i32, Type::INT4)],
         )

From 0fa32471ef2e20b7f2e554d6d97cde3a67f1d494 Mon Sep 17 00:00:00 2001
From: Ramnivas Laddad <ramnivas@exograph.dev>
Date: Tue, 9 Jul 2024 17:59:39 -0700
Subject: [PATCH 036/106] Fix a clippy warning

---
 tokio-postgres/src/query.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index b54e095df..e304bbaea 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -54,7 +54,7 @@ where
     };
     let responses = start(client, buf).await?;
     Ok(RowStream {
-        statement: statement,
+        statement,
         responses,
         rows_affected: None,
         _p: PhantomPinned,

From 71c836b980799256a7f266195382fc8449fca5e4 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 13 Jul 2024 20:45:32 -0400
Subject: [PATCH 037/106] query_typed tweaks

---
 postgres/src/client.rs               | 65 ++++++++++++++++++++++++++++
 postgres/src/generic_client.rs       | 45 +++++++++++++++++++
 postgres/src/transaction.rs          | 29 +++++++++++++
 tokio-postgres/src/client.rs         | 63 +++++++++++++++++----------
 tokio-postgres/src/generic_client.rs | 22 ++++++++++
 tokio-postgres/src/query.rs          | 63 +++++++++++----------------
 tokio-postgres/src/transaction.rs    | 27 ++++++++----
 7 files changed, 243 insertions(+), 71 deletions(-)

diff --git a/postgres/src/client.rs b/postgres/src/client.rs
index c8e14cf81..42ce6dec9 100644
--- a/postgres/src/client.rs
+++ b/postgres/src/client.rs
@@ -257,6 +257,71 @@ impl Client {
         Ok(RowIter::new(self.connection.as_ref(), stream))
     }
 
+    /// Like `query`, but requires the types of query parameters to be explicitly specified.
+    ///
+    /// Compared to `query`, this method allows performing queries without three round trips (for
+    /// prepare, execute, and close) by requiring the caller to specify parameter values along with
+    /// their Postgres type. Thus, this is suitable in environments where prepared statements aren't
+    /// supported (such as Cloudflare Workers with Hyperdrive).
+    ///
+    /// A statement may contain parameters, specified by `$n`, where `n` is the index of the
+    /// parameter of the list provided, 1-indexed.
+    pub fn query_typed(
+        &mut self,
+        query: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.connection
+            .block_on(self.client.query_typed(query, params))
+    }
+
+    /// The maximally flexible version of [`query_typed`].
+    ///
+    /// Compared to `query`, this method allows performing queries without three round trips (for
+    /// prepare, execute, and close) by requiring the caller to specify parameter values along with
+    /// their Postgres type. Thus, this is suitable in environments where prepared statements aren't
+    /// supported (such as Cloudflare Workers with Hyperdrive).
+    ///
+    /// A statement may contain parameters, specified by `$n`, where `n` is the index of the
+    /// parameter of the list provided, 1-indexed.
+    ///
+    /// [`query_typed`]: #method.query_typed
+    ///
+    /// # Examples
+    /// ```no_run
+    /// # use postgres::{Client, NoTls};
+    /// use postgres::types::{ToSql, Type};
+    /// use fallible_iterator::FallibleIterator;
+    /// # fn main() -> Result<(), postgres::Error> {
+    /// # let mut client = Client::connect("host=localhost user=postgres", NoTls)?;
+    ///
+    /// let params: Vec<(String, Type)> = vec![
+    ///     ("first param".into(), Type::TEXT),
+    ///     ("second param".into(), Type::TEXT),
+    /// ];
+    /// let mut it = client.query_typed_raw(
+    ///     "SELECT foo FROM bar WHERE biz = $1 AND baz = $2",
+    ///     params,
+    /// )?;
+    ///
+    /// while let Some(row) = it.next()? {
+    ///     let foo: i32 = row.get("foo");
+    ///     println!("foo: {}", foo);
+    /// }
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn query_typed_raw<P, I>(&mut self, query: &str, params: I) -> Result<RowIter<'_>, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)>,
+    {
+        let stream = self
+            .connection
+            .block_on(self.client.query_typed_raw(query, params))?;
+        Ok(RowIter::new(self.connection.as_ref(), stream))
+    }
+
     /// Creates a new prepared statement.
     ///
     /// Prepared statements can be executed repeatedly, and may contain query parameters (indicated by `$1`, `$2`, etc),
diff --git a/postgres/src/generic_client.rs b/postgres/src/generic_client.rs
index 12f07465d..7b534867c 100644
--- a/postgres/src/generic_client.rs
+++ b/postgres/src/generic_client.rs
@@ -44,6 +44,19 @@ pub trait GenericClient: private::Sealed {
         I: IntoIterator<Item = P>,
         I::IntoIter: ExactSizeIterator;
 
+    /// Like [`Client::query_typed`]
+    fn query_typed(
+        &mut self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error>;
+
+    /// Like [`Client::query_typed_raw`]
+    fn query_typed_raw<P, I>(&mut self, statement: &str, params: I) -> Result<RowIter<'_>, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)> + Sync + Send;
+
     /// Like `Client::prepare`.
     fn prepare(&mut self, query: &str) -> Result<Statement, Error>;
 
@@ -115,6 +128,22 @@ impl GenericClient for Client {
         self.query_raw(query, params)
     }
 
+    fn query_typed(
+        &mut self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.query_typed(statement, params)
+    }
+
+    fn query_typed_raw<P, I>(&mut self, statement: &str, params: I) -> Result<RowIter<'_>, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)> + Sync + Send,
+    {
+        self.query_typed_raw(statement, params)
+    }
+
     fn prepare(&mut self, query: &str) -> Result<Statement, Error> {
         self.prepare(query)
     }
@@ -195,6 +224,22 @@ impl GenericClient for Transaction<'_> {
         self.query_raw(query, params)
     }
 
+    fn query_typed(
+        &mut self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.query_typed(statement, params)
+    }
+
+    fn query_typed_raw<P, I>(&mut self, statement: &str, params: I) -> Result<RowIter<'_>, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)> + Sync + Send,
+    {
+        self.query_typed_raw(statement, params)
+    }
+
     fn prepare(&mut self, query: &str) -> Result<Statement, Error> {
         self.prepare(query)
     }
diff --git a/postgres/src/transaction.rs b/postgres/src/transaction.rs
index 17c49c406..5c8c15973 100644
--- a/postgres/src/transaction.rs
+++ b/postgres/src/transaction.rs
@@ -115,6 +115,35 @@ impl<'a> Transaction<'a> {
         Ok(RowIter::new(self.connection.as_ref(), stream))
     }
 
+    /// Like `Client::query_typed`.
+    pub fn query_typed(
+        &mut self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.connection.block_on(
+            self.transaction
+                .as_ref()
+                .unwrap()
+                .query_typed(statement, params),
+        )
+    }
+
+    /// Like `Client::query_typed_raw`.
+    pub fn query_typed_raw<P, I>(&mut self, query: &str, params: I) -> Result<RowIter<'_>, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)>,
+    {
+        let stream = self.connection.block_on(
+            self.transaction
+                .as_ref()
+                .unwrap()
+                .query_typed_raw(query, params),
+        )?;
+        Ok(RowIter::new(self.connection.as_ref(), stream))
+    }
+
     /// Binds parameters to a statement, creating a "portal".
     ///
     /// Portals can be used with the `query_portal` method to page through the results of a query without being forced
diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
index 2b29351a5..b04f05f88 100644
--- a/tokio-postgres/src/client.rs
+++ b/tokio-postgres/src/client.rs
@@ -333,7 +333,6 @@ impl Client {
     ///
     /// ```no_run
     /// # async fn async_main(client: &tokio_postgres::Client) -> Result<(), tokio_postgres::Error> {
-    /// use tokio_postgres::types::ToSql;
     /// use futures_util::{pin_mut, TryStreamExt};
     ///
     /// let params: Vec<String> = vec![
@@ -373,43 +372,59 @@ impl Client {
     ///
     /// A statement may contain parameters, specified by `$n`, where `n` is the index of the
     /// parameter of the list provided, 1-indexed.
+    pub async fn query_typed(
+        &self,
+        query: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.query_typed_raw(query, params.iter().map(|(v, t)| (*v, t.clone())))
+            .await?
+            .try_collect()
+            .await
+    }
+
+    /// The maximally flexible version of [`query_typed`].
+    ///
+    /// Compared to `query`, this method allows performing queries without three round trips (for
+    /// prepare, execute, and close) by requiring the caller to specify parameter values along with
+    /// their Postgres type. Thus, this is suitable in environments where prepared statements aren't
+    /// supported (such as Cloudflare Workers with Hyperdrive).
+    ///
+    /// A statement may contain parameters, specified by `$n`, where `n` is the index of the
+    /// parameter of the list provided, 1-indexed.
+    ///
+    /// [`query_typed`]: #method.query_typed
     ///
     /// # Examples
     ///
     /// ```no_run
     /// # async fn async_main(client: &tokio_postgres::Client) -> Result<(), tokio_postgres::Error> {
-    /// use tokio_postgres::types::ToSql;
-    /// use tokio_postgres::types::Type;
     /// use futures_util::{pin_mut, TryStreamExt};
+    /// use tokio_postgres::types::Type;
     ///
-    /// let rows = client.query_typed(
+    /// let params: Vec<(String, Type)> = vec![
+    ///     ("first param".into(), Type::TEXT),
+    ///     ("second param".into(), Type::TEXT),
+    /// ];
+    /// let mut it = client.query_typed_raw(
     ///     "SELECT foo FROM bar WHERE biz = $1 AND baz = $2",
-    ///     &[(&"first param", Type::TEXT), (&2i32, Type::INT4)],
+    ///     params,
     /// ).await?;
     ///
-    /// for row in rows {
-    ///    let foo: i32 = row.get("foo");
-    ///    println!("foo: {}", foo);
+    /// pin_mut!(it);
+    /// while let Some(row) = it.try_next().await? {
+    ///     let foo: i32 = row.get("foo");
+    ///     println!("foo: {}", foo);
     /// }
     /// # Ok(())
     /// # }
     /// ```
-    pub async fn query_typed(
-        &self,
-        statement: &str,
-        params: &[(&(dyn ToSql + Sync), Type)],
-    ) -> Result<Vec<Row>, Error> {
-        fn slice_iter<'a>(
-            s: &'a [(&'a (dyn ToSql + Sync), Type)],
-        ) -> impl ExactSizeIterator<Item = (&'a dyn ToSql, Type)> + 'a {
-            s.iter()
-                .map(|(param, param_type)| (*param as _, param_type.clone()))
-        }
-
-        query::query_typed(&self.inner, statement, slice_iter(params))
-            .await?
-            .try_collect()
-            .await
+    pub async fn query_typed_raw<P, I>(&self, query: &str, params: I) -> Result<RowStream, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)>,
+    {
+        query::query_typed(&self.inner, query, params).await
     }
 
     /// Executes a statement, returning the number of rows modified.
diff --git a/tokio-postgres/src/generic_client.rs b/tokio-postgres/src/generic_client.rs
index b91d78064..6e7dffeb1 100644
--- a/tokio-postgres/src/generic_client.rs
+++ b/tokio-postgres/src/generic_client.rs
@@ -63,6 +63,12 @@ pub trait GenericClient: private::Sealed {
         params: &[(&(dyn ToSql + Sync), Type)],
     ) -> Result<Vec<Row>, Error>;
 
+    /// Like [`Client::query_typed_raw`]
+    async fn query_typed_raw<P, I>(&self, statement: &str, params: I) -> Result<RowStream, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)> + Sync + Send;
+
     /// Like [`Client::prepare`].
     async fn prepare(&self, query: &str) -> Result<Statement, Error>;
 
@@ -154,6 +160,14 @@ impl GenericClient for Client {
         self.query_typed(statement, params).await
     }
 
+    async fn query_typed_raw<P, I>(&self, statement: &str, params: I) -> Result<RowStream, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)> + Sync + Send,
+    {
+        self.query_typed_raw(statement, params).await
+    }
+
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
         self.prepare(query).await
     }
@@ -252,6 +266,14 @@ impl GenericClient for Transaction<'_> {
         self.query_typed(statement, params).await
     }
 
+    async fn query_typed_raw<P, I>(&self, statement: &str, params: I) -> Result<RowStream, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)> + Sync + Send,
+    {
+        self.query_typed_raw(statement, params).await
+    }
+
     async fn prepare(&self, query: &str) -> Result<Statement, Error> {
         self.prepare(query).await
     }
diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index e304bbaea..be42d66b6 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -69,29 +69,21 @@ pub async fn query_typed<'a, P, I>(
 where
     P: BorrowToSql,
     I: IntoIterator<Item = (P, Type)>,
-    I::IntoIter: ExactSizeIterator,
 {
-    let (params, param_types): (Vec<_>, Vec<_>) = params.into_iter().unzip();
-
-    let params = params.into_iter();
-
-    let param_oids = param_types.iter().map(|t| t.oid()).collect::<Vec<_>>();
-
-    let params = params.into_iter();
-
-    let buf = client.with_buf(|buf| {
-        frontend::parse("", query, param_oids.into_iter(), buf).map_err(Error::parse)?;
-
-        encode_bind_with_statement_name_and_param_types("", &param_types, params, "", buf)?;
-
-        frontend::describe(b'S', "", buf).map_err(Error::encode)?;
-
-        frontend::execute("", 0, buf).map_err(Error::encode)?;
+    let buf = {
+        let params = params.into_iter().collect::<Vec<_>>();
+        let param_oids = params.iter().map(|(_, t)| t.oid()).collect::<Vec<_>>();
 
-        frontend::sync(buf);
+        client.with_buf(|buf| {
+            frontend::parse("", query, param_oids.into_iter(), buf).map_err(Error::parse)?;
+            encode_bind_raw("", params, "", buf)?;
+            frontend::describe(b'S', "", buf).map_err(Error::encode)?;
+            frontend::execute("", 0, buf).map_err(Error::encode)?;
+            frontend::sync(buf);
 
-        Ok(buf.split().freeze())
-    })?;
+            Ok(buf.split().freeze())
+        })?
+    };
 
     let mut responses = client.send(RequestMessages::Single(FrontendMessage::Raw(buf)))?;
 
@@ -233,47 +225,42 @@ where
     I: IntoIterator<Item = P>,
     I::IntoIter: ExactSizeIterator,
 {
-    encode_bind_with_statement_name_and_param_types(
+    let params = params.into_iter();
+    if params.len() != statement.params().len() {
+        return Err(Error::parameters(params.len(), statement.params().len()));
+    }
+
+    encode_bind_raw(
         statement.name(),
-        statement.params(),
-        params,
+        params.zip(statement.params().iter().cloned()),
         portal,
         buf,
     )
 }
 
-fn encode_bind_with_statement_name_and_param_types<P, I>(
+fn encode_bind_raw<P, I>(
     statement_name: &str,
-    param_types: &[Type],
     params: I,
     portal: &str,
     buf: &mut BytesMut,
 ) -> Result<(), Error>
 where
     P: BorrowToSql,
-    I: IntoIterator<Item = P>,
+    I: IntoIterator<Item = (P, Type)>,
     I::IntoIter: ExactSizeIterator,
 {
-    let params = params.into_iter();
-
-    if param_types.len() != params.len() {
-        return Err(Error::parameters(params.len(), param_types.len()));
-    }
-
     let (param_formats, params): (Vec<_>, Vec<_>) = params
-        .zip(param_types.iter())
-        .map(|(p, ty)| (p.borrow_to_sql().encode_format(ty) as i16, p))
+        .into_iter()
+        .map(|(p, ty)| (p.borrow_to_sql().encode_format(&ty) as i16, (p, ty)))
         .unzip();
 
-    let params = params.into_iter();
-
     let mut error_idx = 0;
     let r = frontend::bind(
         portal,
         statement_name,
         param_formats,
-        params.zip(param_types).enumerate(),
-        |(idx, (param, ty)), buf| match param.borrow_to_sql().to_sql_checked(ty, buf) {
+        params.into_iter().enumerate(),
+        |(idx, (param, ty)), buf| match param.borrow_to_sql().to_sql_checked(&ty, buf) {
             Ok(IsNull::No) => Ok(postgres_protocol::IsNull::No),
             Ok(IsNull::Yes) => Ok(postgres_protocol::IsNull::Yes),
             Err(e) => {
diff --git a/tokio-postgres/src/transaction.rs b/tokio-postgres/src/transaction.rs
index 3e62b2ac7..17a50b60f 100644
--- a/tokio-postgres/src/transaction.rs
+++ b/tokio-postgres/src/transaction.rs
@@ -149,6 +149,24 @@ impl<'a> Transaction<'a> {
         self.client.query_raw(statement, params).await
     }
 
+    /// Like `Client::query_typed`.
+    pub async fn query_typed(
+        &self,
+        statement: &str,
+        params: &[(&(dyn ToSql + Sync), Type)],
+    ) -> Result<Vec<Row>, Error> {
+        self.client.query_typed(statement, params).await
+    }
+
+    /// Like `Client::query_typed_raw`.
+    pub async fn query_typed_raw<P, I>(&self, query: &str, params: I) -> Result<RowStream, Error>
+    where
+        P: BorrowToSql,
+        I: IntoIterator<Item = (P, Type)>,
+    {
+        self.client.query_typed_raw(query, params).await
+    }
+
     /// Like `Client::execute`.
     pub async fn execute<T>(
         &self,
@@ -227,15 +245,6 @@ impl<'a> Transaction<'a> {
         query::query_portal(self.client.inner(), portal, max_rows).await
     }
 
-    /// Like `Client::query_typed`.
-    pub async fn query_typed(
-        &self,
-        statement: &str,
-        params: &[(&(dyn ToSql + Sync), Type)],
-    ) -> Result<Vec<Row>, Error> {
-        self.client.query_typed(statement, params).await
-    }
-
     /// Like `Client::copy_in`.
     pub async fn copy_in<T, U>(&self, statement: &T) -> Result<CopyInSink<U>, Error>
     where

From a0b2d701ebee8fd5c5b3d6ee5cf0cde5d7f36a65 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 21 Jul 2024 20:04:35 -0400
Subject: [PATCH 038/106] Fix cancellation of TransactionBuilder::start

---
 tokio-postgres/src/client.rs              | 42 ++---------------------
 tokio-postgres/src/transaction_builder.rs | 40 +++++++++++++++++++--
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
index b04f05f88..92eabde36 100644
--- a/tokio-postgres/src/client.rs
+++ b/tokio-postgres/src/client.rs
@@ -1,4 +1,4 @@
-use crate::codec::{BackendMessages, FrontendMessage};
+use crate::codec::BackendMessages;
 use crate::config::SslMode;
 use crate::connection::{Request, RequestMessages};
 use crate::copy_out::CopyOutStream;
@@ -21,7 +21,7 @@ use fallible_iterator::FallibleIterator;
 use futures_channel::mpsc;
 use futures_util::{future, pin_mut, ready, StreamExt, TryStreamExt};
 use parking_lot::Mutex;
-use postgres_protocol::message::{backend::Message, frontend};
+use postgres_protocol::message::backend::Message;
 use postgres_types::BorrowToSql;
 use std::collections::HashMap;
 use std::fmt;
@@ -532,43 +532,7 @@ impl Client {
     ///
     /// The transaction will roll back by default - use the `commit` method to commit it.
     pub async fn transaction(&mut self) -> Result<Transaction<'_>, Error> {
-        struct RollbackIfNotDone<'me> {
-            client: &'me Client,
-            done: bool,
-        }
-
-        impl<'a> Drop for RollbackIfNotDone<'a> {
-            fn drop(&mut self) {
-                if self.done {
-                    return;
-                }
-
-                let buf = self.client.inner().with_buf(|buf| {
-                    frontend::query("ROLLBACK", buf).unwrap();
-                    buf.split().freeze()
-                });
-                let _ = self
-                    .client
-                    .inner()
-                    .send(RequestMessages::Single(FrontendMessage::Raw(buf)));
-            }
-        }
-
-        // This is done, as `Future` created by this method can be dropped after
-        // `RequestMessages` is synchronously send to the `Connection` by
-        // `batch_execute()`, but before `Responses` is asynchronously polled to
-        // completion. In that case `Transaction` won't be created and thus
-        // won't be rolled back.
-        {
-            let mut cleaner = RollbackIfNotDone {
-                client: self,
-                done: false,
-            };
-            self.batch_execute("BEGIN").await?;
-            cleaner.done = true;
-        }
-
-        Ok(Transaction::new(self))
+        self.build_transaction().start().await
     }
 
     /// Returns a builder for a transaction with custom settings.
diff --git a/tokio-postgres/src/transaction_builder.rs b/tokio-postgres/src/transaction_builder.rs
index 9718ac588..93e9e9801 100644
--- a/tokio-postgres/src/transaction_builder.rs
+++ b/tokio-postgres/src/transaction_builder.rs
@@ -1,4 +1,6 @@
-use crate::{Client, Error, Transaction};
+use postgres_protocol::message::frontend;
+
+use crate::{codec::FrontendMessage, connection::RequestMessages, Client, Error, Transaction};
 
 /// The isolation level of a database transaction.
 #[derive(Debug, Copy, Clone)]
@@ -106,7 +108,41 @@ impl<'a> TransactionBuilder<'a> {
             query.push_str(s);
         }
 
-        self.client.batch_execute(&query).await?;
+        struct RollbackIfNotDone<'me> {
+            client: &'me Client,
+            done: bool,
+        }
+
+        impl<'a> Drop for RollbackIfNotDone<'a> {
+            fn drop(&mut self) {
+                if self.done {
+                    return;
+                }
+
+                let buf = self.client.inner().with_buf(|buf| {
+                    frontend::query("ROLLBACK", buf).unwrap();
+                    buf.split().freeze()
+                });
+                let _ = self
+                    .client
+                    .inner()
+                    .send(RequestMessages::Single(FrontendMessage::Raw(buf)));
+            }
+        }
+
+        // This is done as `Future` created by this method can be dropped after
+        // `RequestMessages` is synchronously send to the `Connection` by
+        // `batch_execute()`, but before `Responses` is asynchronously polled to
+        // completion. In that case `Transaction` won't be created and thus
+        // won't be rolled back.
+        {
+            let mut cleaner = RollbackIfNotDone {
+                client: self.client,
+                done: false,
+            };
+            self.client.batch_execute(&query).await?;
+            cleaner.done = true;
+        }
 
         Ok(Transaction::new(self.client))
     }

From c3580774fcdc4597dac81e1128ef8bef1e6ff3a7 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 21 Jul 2024 20:23:50 -0400
Subject: [PATCH 039/106] Release postgres-protocol v0.6.7

---
 postgres-protocol/CHANGELOG.md | 17 ++++++++++++++++-
 postgres-protocol/Cargo.toml   |  2 +-
 postgres-types/Cargo.toml      |  2 +-
 tokio-postgres/Cargo.toml      |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/postgres-protocol/CHANGELOG.md b/postgres-protocol/CHANGELOG.md
index 1c371675c..54dce91b0 100644
--- a/postgres-protocol/CHANGELOG.md
+++ b/postgres-protocol/CHANGELOG.md
@@ -1,6 +1,21 @@
 # Change Log
 
-## v0.6.6 -2023-08-19
+## v0.6.7 - 2024-07-21
+
+### Deprecated
+
+* Deprecated `ErrorField::value`.
+
+### Added
+
+* Added a `Clone` implementation for `DataRowBody`.
+* Added `ErrorField::value_bytes`.
+
+### Changed
+
+* Upgraded `base64`.
+
+## v0.6.6 - 2023-08-19
 
 ### Added
 
diff --git a/postgres-protocol/Cargo.toml b/postgres-protocol/Cargo.toml
index a8a130495..49cf2d59c 100644
--- a/postgres-protocol/Cargo.toml
+++ b/postgres-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-protocol"
-version = "0.6.6"
+version = "0.6.7"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 description = "Low level Postgres protocol APIs"
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index 33296db2c..984fd186f 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -31,7 +31,7 @@ with-time-0_3 = ["time-03"]
 [dependencies]
 bytes = "1.0"
 fallible-iterator = "0.2"
-postgres-protocol = { version = "0.6.5", path = "../postgres-protocol" }
+postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
 postgres-derive = { version = "0.4.5", optional = true, path = "../postgres-derive" }
 
 array-init = { version = "2", optional = true }
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index 2e080cfb2..92f4ee696 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -54,7 +54,7 @@ parking_lot = "0.12"
 percent-encoding = "2.0"
 pin-project-lite = "0.2"
 phf = "0.11"
-postgres-protocol = { version = "0.6.6", path = "../postgres-protocol" }
+postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
 postgres-types = { version = "0.2.5", path = "../postgres-types" }
 tokio = { version = "1.27", features = ["io-util"] }
 tokio-util = { version = "0.7", features = ["codec"] }

From 6b4566b132ca4a81c06eaf35eb63318a69360f48 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 21 Jul 2024 20:28:22 -0400
Subject: [PATCH 040/106] Release postgres-types v0.2.7

---
 postgres-types/CHANGELOG.md | 8 ++++++++
 postgres-types/Cargo.toml   | 2 +-
 tokio-postgres/Cargo.toml   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/postgres-types/CHANGELOG.md b/postgres-types/CHANGELOG.md
index 157a2cc7d..1e5cd31d8 100644
--- a/postgres-types/CHANGELOG.md
+++ b/postgres-types/CHANGELOG.md
@@ -2,9 +2,17 @@
 
 ## Unreleased
 
+## v0.2.7 - 2024-07-21
+
+### Added
+
+* Added `Default` implementation for `Json`.
+* Added a `js` feature for WASM compatibility.
+
 ### Changed
 
 * `FromStr` implementation for `PgLsn` no longer allocates a `Vec` when splitting an lsn string on it's `/`.
+* The `eui48-1` feature no longer enables default features of the `eui48` library.
 
 ## v0.2.6 - 2023-08-19
 
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index 984fd186f..e2d21b358 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-types"
-version = "0.2.6"
+version = "0.2.7"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index 92f4ee696..f762b1184 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -55,7 +55,7 @@ percent-encoding = "2.0"
 pin-project-lite = "0.2"
 phf = "0.11"
 postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
-postgres-types = { version = "0.2.5", path = "../postgres-types" }
+postgres-types = { version = "0.2.7", path = "../postgres-types" }
 tokio = { version = "1.27", features = ["io-util"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 rand = "0.8.5"

From 92266188e8fd081be8e29d425b9fd334d2039196 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 21 Jul 2024 20:36:18 -0400
Subject: [PATCH 041/106] Release tokio-postgres v0.7.11

---
 postgres-native-tls/Cargo.toml |  2 +-
 postgres-openssl/Cargo.toml    |  2 +-
 postgres/Cargo.toml            |  2 +-
 tokio-postgres/CHANGELOG.md    | 24 +++++++++++++++++++++---
 tokio-postgres/Cargo.toml      |  2 +-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/postgres-native-tls/Cargo.toml b/postgres-native-tls/Cargo.toml
index 936eeeaa4..6c17d0889 100644
--- a/postgres-native-tls/Cargo.toml
+++ b/postgres-native-tls/Cargo.toml
@@ -19,7 +19,7 @@ runtime = ["tokio-postgres/runtime"]
 native-tls = "0.2"
 tokio = "1.0"
 tokio-native-tls = "0.3"
-tokio-postgres = { version = "0.7.0", path = "../tokio-postgres", default-features = false }
+tokio-postgres = { version = "0.7.11", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
 futures-util = "0.3"
diff --git a/postgres-openssl/Cargo.toml b/postgres-openssl/Cargo.toml
index b7ebd3385..7c19070bf 100644
--- a/postgres-openssl/Cargo.toml
+++ b/postgres-openssl/Cargo.toml
@@ -19,7 +19,7 @@ runtime = ["tokio-postgres/runtime"]
 openssl = "0.10"
 tokio = "1.0"
 tokio-openssl = "0.6"
-tokio-postgres = { version = "0.7.0", path = "../tokio-postgres", default-features = false }
+tokio-postgres = { version = "0.7.11", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
 futures-util = "0.3"
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index 2ff3c875e..f1dc3c685 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -40,7 +40,7 @@ bytes = "1.0"
 fallible-iterator = "0.2"
 futures-util = { version = "0.3.14", features = ["sink"] }
 log = "0.4"
-tokio-postgres = { version = "0.7.10", path = "../tokio-postgres" }
+tokio-postgres = { version = "0.7.11", path = "../tokio-postgres" }
 tokio = { version = "1.0", features = ["rt", "time"] }
 
 [dev-dependencies]
diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index 775c22e34..e0be26296 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -2,10 +2,28 @@
 
 ## Unreleased
 
+## v0.7.11 - 2024-07-21
+
+### Fixed
+
+* Fixed handling of non-UTF8 error fields which can be sent after failed handshakes.
+* Fixed cancellation handling of `TransactionBuilder::start` futures.
+
+### Added
+
+* Added `table_oid` and `field_id` fields to `Columns` struct of prepared statements.
+* Added `GenericClient::simple_query`.
+* Added `#[track_caller]` to `Row::get` and `SimpleQueryRow::get`.
+* Added `TargetSessionAttrs::ReadOnly`.
+* Added `Debug` implementation for `Statement`.
+* Added `Clone` implementation for `Row`.
+* Added `SimpleQueryMessage::RowDescription`.
+* Added `{Client, Transaction, GenericClient}::query_typed`.
+
+### Changed
+
 * Disable `rustc-serialize` compatibility of `eui48-1` dependency
-* Remove tests for `eui48-04`
-* Add `table_oid` and `field_id` fields to `Columns` struct of prepared statements.
-* Add `GenericClient::simple_query`.
+* Config setters now take `impl Into<String>`.
 
 ## v0.7.10 - 2023-08-25
 
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index f762b1184..c2f80dc7e 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokio-postgres"
-version = "0.7.10"
+version = "0.7.11"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From 9f196e7f5ba6067efe55f758d743cdfd9b606cff Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 21 Jul 2024 20:38:52 -0400
Subject: [PATCH 042/106] Release postgres v0.19.8

---
 postgres-native-tls/Cargo.toml | 2 +-
 postgres-openssl/Cargo.toml    | 2 +-
 postgres/CHANGELOG.md          | 6 ++++++
 postgres/Cargo.toml            | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/postgres-native-tls/Cargo.toml b/postgres-native-tls/Cargo.toml
index 6c17d0889..02259b3dc 100644
--- a/postgres-native-tls/Cargo.toml
+++ b/postgres-native-tls/Cargo.toml
@@ -24,4 +24,4 @@ tokio-postgres = { version = "0.7.11", path = "../tokio-postgres", default-featu
 [dev-dependencies]
 futures-util = "0.3"
 tokio = { version = "1.0", features = ["macros", "net", "rt"] }
-postgres = { version = "0.19.0", path = "../postgres" }
+postgres = { version = "0.19.8", path = "../postgres" }
diff --git a/postgres-openssl/Cargo.toml b/postgres-openssl/Cargo.toml
index 7c19070bf..9013384a2 100644
--- a/postgres-openssl/Cargo.toml
+++ b/postgres-openssl/Cargo.toml
@@ -24,4 +24,4 @@ tokio-postgres = { version = "0.7.11", path = "../tokio-postgres", default-featu
 [dev-dependencies]
 futures-util = "0.3"
 tokio = { version = "1.0", features = ["macros", "net", "rt"] }
-postgres = { version = "0.19.0", path = "../postgres" }
+postgres = { version = "0.19.8", path = "../postgres" }
diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
index 7f856b5ac..258cdb518 100644
--- a/postgres/CHANGELOG.md
+++ b/postgres/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.19.8 - 2024-07-21
+
+### Added
+
+* Added `{Client, Transaction, GenericClient}::query_typed`.
+
 ## v0.19.7 - 2023-08-25
 
 ## Fixed
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index f1dc3c685..ff95c4f14 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres"
-version = "0.19.7"
+version = "0.19.8"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From 6de0fceebe3c1800a5e812f35449e464fbc33f55 Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Mon, 22 Jul 2024 15:54:40 -0400
Subject: [PATCH 043/106] Add jiff support

---
 postgres-types/CHANGELOG.md   |   4 ++
 postgres-types/Cargo.toml     |   2 +
 postgres-types/src/jiff_01.rs | 118 ++++++++++++++++++++++++++++++++++
 postgres-types/src/lib.rs     |   7 ++
 postgres/CHANGELOG.md         |   6 ++
 postgres/Cargo.toml           |   1 +
 tokio-postgres/CHANGELOG.md   |   4 ++
 tokio-postgres/Cargo.toml     |   2 +
 tokio-postgres/src/lib.rs     |   1 +
 9 files changed, 145 insertions(+)
 create mode 100644 postgres-types/src/jiff_01.rs

diff --git a/postgres-types/CHANGELOG.md b/postgres-types/CHANGELOG.md
index 1e5cd31d8..b11e18d32 100644
--- a/postgres-types/CHANGELOG.md
+++ b/postgres-types/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Added
+
+* Added support for `jiff` 0.1 via the `with-jiff-01` feature.
+
 ## v0.2.7 - 2024-07-21
 
 ### Added
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index e2d21b358..941f4fcc4 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -21,6 +21,7 @@ with-eui48-0_4 = ["eui48-04"]
 with-eui48-1 = ["eui48-1"]
 with-geo-types-0_6 = ["geo-types-06"]
 with-geo-types-0_7 = ["geo-types-0_7"]
+with-jiff-0_1 = ["jiff-01"]
 with-serde_json-1 = ["serde-1", "serde_json-1"]
 with-smol_str-01 = ["smol_str-01"]
 with-uuid-0_8 = ["uuid-08"]
@@ -46,6 +47,7 @@ eui48-04 = { version = "0.4", package = "eui48", optional = true }
 eui48-1 = { version = "1.0", package = "eui48", optional = true, default-features = false }
 geo-types-06 = { version = "0.6", package = "geo-types", optional = true }
 geo-types-0_7 = { version = "0.7", package = "geo-types", optional = true }
+jiff-01 = { version = "0.1", package = "jiff", optional = true }
 serde-1 = { version = "1.0", package = "serde", optional = true }
 serde_json-1 = { version = "1.0", package = "serde_json", optional = true }
 uuid-08 = { version = "0.8", package = "uuid", optional = true }
diff --git a/postgres-types/src/jiff_01.rs b/postgres-types/src/jiff_01.rs
new file mode 100644
index 000000000..eec6aa2f8
--- /dev/null
+++ b/postgres-types/src/jiff_01.rs
@@ -0,0 +1,118 @@
+use bytes::BytesMut;
+use jiff_01::{
+    civil::{Date, DateTime, Time},
+    tz::TimeZone,
+    Span, Timestamp as JiffTimestamp, Zoned,
+};
+use postgres_protocol::types;
+use std::error::Error;
+
+use crate::{FromSql, IsNull, ToSql, Type};
+
+const fn base() -> DateTime {
+    DateTime::constant(2000, 1, 1, 0, 0, 0, 0)
+}
+
+impl<'a> FromSql<'a> for DateTime {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<DateTime, Box<dyn Error + Sync + Send>> {
+        let t = types::timestamp_from_sql(raw)?;
+        Ok(base().checked_add(Span::new().microseconds(t))?)
+    }
+
+    accepts!(TIMESTAMP);
+}
+
+impl ToSql for DateTime {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        types::timestamp_to_sql(self.since(base())?.get_microseconds(), w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIMESTAMP);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for JiffTimestamp {
+    fn from_sql(type_: &Type, raw: &[u8]) -> Result<JiffTimestamp, Box<dyn Error + Sync + Send>> {
+        Ok(DateTime::from_sql(type_, raw)?
+            .to_zoned(TimeZone::UTC)?
+            .timestamp())
+    }
+
+    accepts!(TIMESTAMPTZ);
+}
+
+impl ToSql for JiffTimestamp {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        types::timestamp_to_sql(
+            self.since(base().to_zoned(TimeZone::UTC)?)?
+                .get_microseconds(),
+            w,
+        );
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIMESTAMPTZ);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Zoned {
+    fn from_sql(type_: &Type, raw: &[u8]) -> Result<Zoned, Box<dyn Error + Sync + Send>> {
+        Ok(JiffTimestamp::from_sql(type_, raw)?.to_zoned(TimeZone::UTC))
+    }
+
+    accepts!(TIMESTAMPTZ);
+}
+
+impl ToSql for Zoned {
+    fn to_sql(
+        &self,
+        type_: &Type,
+        w: &mut BytesMut,
+    ) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        self.timestamp().to_sql(type_, w)
+    }
+
+    accepts!(TIMESTAMPTZ);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Date {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Date, Box<dyn Error + Sync + Send>> {
+        let jd = types::date_from_sql(raw)?;
+        Ok(base().date().checked_add(Span::new().days(jd))?)
+    }
+
+    accepts!(DATE);
+}
+
+impl ToSql for Date {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let jd = self.since(base().date())?.get_days();
+        types::date_to_sql(jd, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(DATE);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Time {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Time, Box<dyn Error + Sync + Send>> {
+        let usec = types::time_from_sql(raw)?;
+        Ok(Time::midnight() + Span::new().microseconds(usec))
+    }
+
+    accepts!(TIME);
+}
+
+impl ToSql for Time {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let delta = self.since(Time::midnight())?;
+        types::time_to_sql(delta.get_microseconds(), w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIME);
+    to_sql_checked!();
+}
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 492039766..7d6d976c6 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -276,6 +276,8 @@ mod eui48_1;
 mod geo_types_06;
 #[cfg(feature = "with-geo-types-0_7")]
 mod geo_types_07;
+#[cfg(feature = "with-jiff-0_1")]
+mod jiff_01;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-smol_str-01")]
@@ -491,6 +493,11 @@ impl WrongType {
 /// | `time::OffsetDateTime`          | TIMESTAMP WITH TIME ZONE            |
 /// | `time::Date`                    | DATE                                |
 /// | `time::Time`                    | TIME                                |
+/// | `jiff::civil::DateTime`         | TIMESTAMP                           |
+/// | `jiff::Timestamp`               | TIMESTAMP WITH TIME ZONE            |
+/// | `jiff::Zoned`                   | TIMESTAMP WITH TIME ZONE            |
+/// | `jiff::civil::Date`             | DATE                                |
+/// | `jiff::civil::Time`             | TIME                                |
 /// | `eui48::MacAddress`             | MACADDR                             |
 /// | `geo_types::Point<f64>`         | POINT                               |
 /// | `geo_types::Rect<f64>`          | BOX                                 |
diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
index 258cdb518..6feb629e4 100644
--- a/postgres/CHANGELOG.md
+++ b/postgres/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### Added
+
+* Added support for `jiff` 0.1 via the `with-jiff-01` feature.
+
 ## v0.19.8 - 2024-07-21
 
 ### Added
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index ff95c4f14..e0e580f7d 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -28,6 +28,7 @@ with-eui48-0_4 = ["tokio-postgres/with-eui48-0_4"]
 with-eui48-1 = ["tokio-postgres/with-eui48-1"]
 with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]
 with-geo-types-0_7 = ["tokio-postgres/with-geo-types-0_7"]
+with-jiff-0_1 = ["tokio-postgres/with-jiff-0_1"]
 with-serde_json-1 = ["tokio-postgres/with-serde_json-1"]
 with-smol_str-01 = ["tokio-postgres/with-smol_str-01"]
 with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]
diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index e0be26296..bf17ec486 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Added
+
+* Added support for `jiff` 0.1 via the `with-jiff-01` feature.
+
 ## v0.7.11 - 2024-07-21
 
 ### Fixed
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index c2f80dc7e..e1e84f7b1 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -34,6 +34,7 @@ with-eui48-0_4 = ["postgres-types/with-eui48-0_4"]
 with-eui48-1 = ["postgres-types/with-eui48-1"]
 with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]
 with-geo-types-0_7 = ["postgres-types/with-geo-types-0_7"]
+with-jiff-0_1 = ["postgres-types/with-jiff-0_1"]
 with-serde_json-1 = ["postgres-types/with-serde_json-1"]
 with-smol_str-01 = ["postgres-types/with-smol_str-01"]
 with-uuid-0_8 = ["postgres-types/with-uuid-0_8"]
@@ -81,6 +82,7 @@ chrono-04 = { version = "0.4", package = "chrono", default-features = false }
 eui48-1 = { version = "1.0", package = "eui48", default-features = false }
 geo-types-06 = { version = "0.6", package = "geo-types" }
 geo-types-07 = { version = "0.7", package = "geo-types" }
+jiff-01 = { version = "0.1", package = "jiff" }
 serde-1 = { version = "1.0", package = "serde" }
 serde_json-1 = { version = "1.0", package = "serde_json" }
 smol_str-01 = { version = "0.1", package = "smol_str" }
diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs
index a603158fb..ec843d511 100644
--- a/tokio-postgres/src/lib.rs
+++ b/tokio-postgres/src/lib.rs
@@ -111,6 +111,7 @@
 //! | `with-eui48-1` | Enable support for the 1.0 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 1.0 | no |
 //! | `with-geo-types-0_6` | Enable support for the 0.6 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.6.0) 0.6 | no |
 //! | `with-geo-types-0_7` | Enable support for the 0.7 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.7.0) 0.7 | no |
+//! | `with-jiff-0_1` | Enable support for the 0.1 version of the `jiff` crate. | [jiff](https://crates.io/crates/jiff/0.1.0) 0.1 | no |
 //! | `with-serde_json-1` | Enable support for the `serde_json` crate. | [serde_json](https://crates.io/crates/serde_json) 1.0 | no |
 //! | `with-uuid-0_8` | Enable support for the `uuid` crate. | [uuid](https://crates.io/crates/uuid) 0.8 | no |
 //! | `with-uuid-1` | Enable support for the `uuid` crate. | [uuid](https://crates.io/crates/uuid) 1.0 | no |

From 0fc4005ed31e3705a04cb7e58eb220d89b922dd0 Mon Sep 17 00:00:00 2001
From: Ramnivas Laddad <ramnivas@exograph.dev>
Date: Mon, 22 Jul 2024 15:07:44 -0700
Subject: [PATCH 044/106] For `query_typed`, deal with the no-data case.

If a query returns no data, we receive `Message::NoData`, which signals
the completion of the query. However, we treated it as a no-op, leading
to processing other messages and eventual failure.

This PR fixes the issue and updates the `query_typed` tests to cover
this scenario.
---
 tokio-postgres/src/query.rs       | 13 +++++++++----
 tokio-postgres/tests/test/main.rs | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index be42d66b6..3ab002871 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -89,10 +89,15 @@ where
 
     loop {
         match responses.next().await? {
-            Message::ParseComplete
-            | Message::BindComplete
-            | Message::ParameterDescription(_)
-            | Message::NoData => {}
+            Message::ParseComplete | Message::BindComplete | Message::ParameterDescription(_) => {}
+            Message::NoData => {
+                return Ok(RowStream {
+                    statement: Statement::unnamed(vec![], vec![]),
+                    responses,
+                    rows_affected: None,
+                    _p: PhantomPinned,
+                });
+            }
             Message::RowDescription(row_description) => {
                 let mut columns: Vec<Column> = vec![];
                 let mut it = row_description.fields();
diff --git a/tokio-postgres/tests/test/main.rs b/tokio-postgres/tests/test/main.rs
index 84c46d101..9a6aa26fe 100644
--- a/tokio-postgres/tests/test/main.rs
+++ b/tokio-postgres/tests/test/main.rs
@@ -997,6 +997,13 @@ async fn query_typed_no_transaction() {
     assert_eq!(second_row.get::<_, i32>(1), 40);
     assert_eq!(second_row.get::<_, &str>(2), "literal");
     assert_eq!(second_row.get::<_, i32>(3), 5);
+
+    // Test for UPDATE that returns no data
+    let updated_rows = client
+        .query_typed("UPDATE foo set age = 33", &[])
+        .await
+        .unwrap();
+    assert_eq!(updated_rows.len(), 0);
 }
 
 #[tokio::test]
@@ -1064,4 +1071,11 @@ async fn query_typed_with_transaction() {
     assert_eq!(second_row.get::<_, i32>(1), 40);
     assert_eq!(second_row.get::<_, &str>(2), "literal");
     assert_eq!(second_row.get::<_, i32>(3), 5);
+
+    // Test for UPDATE that returns no data
+    let updated_rows = transaction
+        .query_typed("UPDATE foo set age = 33", &[])
+        .await
+        .unwrap();
+    assert_eq!(updated_rows.len(), 0);
 }

From aa10f0d75cb23757c9a87fe58363e4e26ae19d1e Mon Sep 17 00:00:00 2001
From: Qiu Chaofan <qcf@ecnelises.com>
Date: Tue, 23 Jul 2024 13:36:51 +0800
Subject: [PATCH 045/106] Support AIX keepalive

---
 tokio-postgres/src/keepalive.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tokio-postgres/src/keepalive.rs b/tokio-postgres/src/keepalive.rs
index c409eb0ea..7bdd76341 100644
--- a/tokio-postgres/src/keepalive.rs
+++ b/tokio-postgres/src/keepalive.rs
@@ -12,12 +12,18 @@ impl From<&KeepaliveConfig> for TcpKeepalive {
     fn from(keepalive_config: &KeepaliveConfig) -> Self {
         let mut tcp_keepalive = Self::new().with_time(keepalive_config.idle);
 
-        #[cfg(not(any(target_os = "redox", target_os = "solaris", target_os = "openbsd")))]
+        #[cfg(not(any(
+            target_os = "aix",
+            target_os = "redox",
+            target_os = "solaris",
+            target_os = "openbsd"
+        )))]
         if let Some(interval) = keepalive_config.interval {
             tcp_keepalive = tcp_keepalive.with_interval(interval);
         }
 
         #[cfg(not(any(
+            target_os = "aix",
             target_os = "redox",
             target_os = "solaris",
             target_os = "windows",

From df2f37d848f5779ed1dc6c1a8f8ded32a15e70c3 Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Tue, 23 Jul 2024 07:54:19 -0400
Subject: [PATCH 046/106] Remove unecessary alias for Timestamp

---
 postgres-types/src/jiff_01.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/postgres-types/src/jiff_01.rs b/postgres-types/src/jiff_01.rs
index eec6aa2f8..c2e4ef06e 100644
--- a/postgres-types/src/jiff_01.rs
+++ b/postgres-types/src/jiff_01.rs
@@ -2,7 +2,7 @@ use bytes::BytesMut;
 use jiff_01::{
     civil::{Date, DateTime, Time},
     tz::TimeZone,
-    Span, Timestamp as JiffTimestamp, Zoned,
+    Span, Timestamp, Zoned,
 };
 use postgres_protocol::types;
 use std::error::Error;
@@ -32,8 +32,8 @@ impl ToSql for DateTime {
     to_sql_checked!();
 }
 
-impl<'a> FromSql<'a> for JiffTimestamp {
-    fn from_sql(type_: &Type, raw: &[u8]) -> Result<JiffTimestamp, Box<dyn Error + Sync + Send>> {
+impl<'a> FromSql<'a> for Timestamp {
+    fn from_sql(type_: &Type, raw: &[u8]) -> Result<Timestamp, Box<dyn Error + Sync + Send>> {
         Ok(DateTime::from_sql(type_, raw)?
             .to_zoned(TimeZone::UTC)?
             .timestamp())
@@ -42,7 +42,7 @@ impl<'a> FromSql<'a> for JiffTimestamp {
     accepts!(TIMESTAMPTZ);
 }
 
-impl ToSql for JiffTimestamp {
+impl ToSql for Timestamp {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         types::timestamp_to_sql(
             self.since(base().to_zoned(TimeZone::UTC)?)?
@@ -58,7 +58,7 @@ impl ToSql for JiffTimestamp {
 
 impl<'a> FromSql<'a> for Zoned {
     fn from_sql(type_: &Type, raw: &[u8]) -> Result<Zoned, Box<dyn Error + Sync + Send>> {
-        Ok(JiffTimestamp::from_sql(type_, raw)?.to_zoned(TimeZone::UTC))
+        Ok(Timestamp::from_sql(type_, raw)?.to_zoned(TimeZone::UTC))
     }
 
     accepts!(TIMESTAMPTZ);

From f00d208959c8c76c9bbe943f53a9a261ef1d2315 Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Tue, 23 Jul 2024 07:56:00 -0400
Subject: [PATCH 047/106] Update impl for Timestamp

The impl now directly computes `Timestamp` rather than going through
`DateTime` and `Zoned`.
---
 postgres-types/src/jiff_01.rs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/postgres-types/src/jiff_01.rs b/postgres-types/src/jiff_01.rs
index c2e4ef06e..d8f8723b6 100644
--- a/postgres-types/src/jiff_01.rs
+++ b/postgres-types/src/jiff_01.rs
@@ -13,6 +13,13 @@ const fn base() -> DateTime {
     DateTime::constant(2000, 1, 1, 0, 0, 0, 0)
 }
 
+/// The number of seconds from 2000-01-01 00:00:00 UTC to the Unix epoch.
+const Y2K_EPOCH: i64 = 946684800;
+
+fn base_ts() -> Timestamp {
+    Timestamp::new(Y2K_EPOCH, 0).unwrap()
+}
+
 impl<'a> FromSql<'a> for DateTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<DateTime, Box<dyn Error + Sync + Send>> {
         let t = types::timestamp_from_sql(raw)?;
@@ -33,10 +40,9 @@ impl ToSql for DateTime {
 }
 
 impl<'a> FromSql<'a> for Timestamp {
-    fn from_sql(type_: &Type, raw: &[u8]) -> Result<Timestamp, Box<dyn Error + Sync + Send>> {
-        Ok(DateTime::from_sql(type_, raw)?
-            .to_zoned(TimeZone::UTC)?
-            .timestamp())
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Timestamp, Box<dyn Error + Sync + Send>> {
+        let t = types::timestamp_from_sql(raw)?;
+        Ok(base_ts().checked_add(Span::new().microseconds(t))?)
     }
 
     accepts!(TIMESTAMPTZ);
@@ -44,11 +50,7 @@ impl<'a> FromSql<'a> for Timestamp {
 
 impl ToSql for Timestamp {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        types::timestamp_to_sql(
-            self.since(base().to_zoned(TimeZone::UTC)?)?
-                .get_microseconds(),
-            w,
-        );
+        types::timestamp_to_sql(self.since(base_ts())?.get_microseconds(), w);
         Ok(IsNull::No)
     }
 

From 815a5d3ae9a580dcc6db3312c8945417eac680f2 Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Tue, 23 Jul 2024 07:58:47 -0400
Subject: [PATCH 048/106] Remove impl for `Zoned`

`Timestamp` already has impl and is semantically accurate for mapping to `timestamptz`, unlike `Zoned`.
End users can do their own conversions from `Timestamp` to `Zoned` if desired.
---
 postgres-types/src/jiff_01.rs | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/postgres-types/src/jiff_01.rs b/postgres-types/src/jiff_01.rs
index d8f8723b6..8a0a38f7c 100644
--- a/postgres-types/src/jiff_01.rs
+++ b/postgres-types/src/jiff_01.rs
@@ -58,27 +58,6 @@ impl ToSql for Timestamp {
     to_sql_checked!();
 }
 
-impl<'a> FromSql<'a> for Zoned {
-    fn from_sql(type_: &Type, raw: &[u8]) -> Result<Zoned, Box<dyn Error + Sync + Send>> {
-        Ok(Timestamp::from_sql(type_, raw)?.to_zoned(TimeZone::UTC))
-    }
-
-    accepts!(TIMESTAMPTZ);
-}
-
-impl ToSql for Zoned {
-    fn to_sql(
-        &self,
-        type_: &Type,
-        w: &mut BytesMut,
-    ) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        self.timestamp().to_sql(type_, w)
-    }
-
-    accepts!(TIMESTAMPTZ);
-    to_sql_checked!();
-}
-
 impl<'a> FromSql<'a> for Date {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<Date, Box<dyn Error + Sync + Send>> {
         let jd = types::date_from_sql(raw)?;

From e19b3dc164ba0cc4f1e601149dc7e7b2837e7276 Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Wed, 14 Aug 2024 09:00:42 -0400
Subject: [PATCH 049/106] Rename PG_EPOCH

---
 postgres-types/src/jiff_01.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/postgres-types/src/jiff_01.rs b/postgres-types/src/jiff_01.rs
index 8a0a38f7c..871d35f62 100644
--- a/postgres-types/src/jiff_01.rs
+++ b/postgres-types/src/jiff_01.rs
@@ -1,8 +1,7 @@
 use bytes::BytesMut;
 use jiff_01::{
     civil::{Date, DateTime, Time},
-    tz::TimeZone,
-    Span, Timestamp, Zoned,
+    Span, Timestamp,
 };
 use postgres_protocol::types;
 use std::error::Error;
@@ -13,11 +12,11 @@ const fn base() -> DateTime {
     DateTime::constant(2000, 1, 1, 0, 0, 0, 0)
 }
 
-/// The number of seconds from 2000-01-01 00:00:00 UTC to the Unix epoch.
-const Y2K_EPOCH: i64 = 946684800;
+/// The number of seconds from the Unix epoch to 2000-01-01 00:00:00 UTC. 
+const PG_EPOCH: i64 = 946684800;
 
 fn base_ts() -> Timestamp {
-    Timestamp::new(Y2K_EPOCH, 0).unwrap()
+    Timestamp::new(PG_EPOCH, 0).unwrap()
 }
 
 impl<'a> FromSql<'a> for DateTime {

From c96342d7f6e1b86db752e96482ad372024062fab Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Wed, 14 Aug 2024 09:14:41 -0400
Subject: [PATCH 050/106] Fix ToSql

This sets the smallest unit to microseconds when calculating time deltas.

Previously, the number of microseconds was expressed improperly because
the rounding was not set.
---
 postgres-types/src/jiff_01.rs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/postgres-types/src/jiff_01.rs b/postgres-types/src/jiff_01.rs
index 871d35f62..54768c10d 100644
--- a/postgres-types/src/jiff_01.rs
+++ b/postgres-types/src/jiff_01.rs
@@ -1,7 +1,7 @@
 use bytes::BytesMut;
 use jiff_01::{
     civil::{Date, DateTime, Time},
-    Span, Timestamp,
+    Span, SpanRound, Timestamp, Unit,
 };
 use postgres_protocol::types;
 use std::error::Error;
@@ -12,13 +12,17 @@ const fn base() -> DateTime {
     DateTime::constant(2000, 1, 1, 0, 0, 0, 0)
 }
 
-/// The number of seconds from the Unix epoch to 2000-01-01 00:00:00 UTC. 
+/// The number of seconds from the Unix epoch to 2000-01-01 00:00:00 UTC.
 const PG_EPOCH: i64 = 946684800;
 
 fn base_ts() -> Timestamp {
     Timestamp::new(PG_EPOCH, 0).unwrap()
 }
 
+fn round_us<'a>() -> SpanRound<'a> {
+    SpanRound::new().largest(Unit::Microsecond)
+}
+
 impl<'a> FromSql<'a> for DateTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<DateTime, Box<dyn Error + Sync + Send>> {
         let t = types::timestamp_from_sql(raw)?;
@@ -30,7 +34,8 @@ impl<'a> FromSql<'a> for DateTime {
 
 impl ToSql for DateTime {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        types::timestamp_to_sql(self.since(base())?.get_microseconds(), w);
+        let span = self.since(base())?.round(round_us())?;
+        types::timestamp_to_sql(span.get_microseconds(), w);
         Ok(IsNull::No)
     }
 
@@ -49,7 +54,8 @@ impl<'a> FromSql<'a> for Timestamp {
 
 impl ToSql for Timestamp {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        types::timestamp_to_sql(self.since(base_ts())?.get_microseconds(), w);
+        let span = self.since(base_ts())?.round(round_us())?;
+        types::timestamp_to_sql(span.get_microseconds(), w);
         Ok(IsNull::No)
     }
 
@@ -88,8 +94,8 @@ impl<'a> FromSql<'a> for Time {
 
 impl ToSql for Time {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let delta = self.since(Time::midnight())?;
-        types::time_to_sql(delta.get_microseconds(), w);
+        let span = self.since(Time::midnight())?.round(round_us())?;
+        types::time_to_sql(span.get_microseconds(), w);
         Ok(IsNull::No)
     }
 

From afef88efb6a2555cf0bed88bd93d5e48f42bffe9 Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Wed, 14 Aug 2024 20:39:55 -0400
Subject: [PATCH 051/106] Add jiff tests and overflow checks

This adds tests in the same fashion as the existing ones for `chrono`
and `time`.

Overflow is now handled using fallible operations.
For example, `Span:microseconds` is replaced with `Span::try_microseconds`.
Postgres infinity values are workiing as expected.

All tests are passing.
---
 postgres-types/src/jiff_01.rs              |  71 +++++++--
 tokio-postgres/tests/test/types/jiff_01.rs | 175 +++++++++++++++++++++
 tokio-postgres/tests/test/types/mod.rs     |   2 +
 3 files changed, 231 insertions(+), 17 deletions(-)
 create mode 100644 tokio-postgres/tests/test/types/jiff_01.rs

diff --git a/postgres-types/src/jiff_01.rs b/postgres-types/src/jiff_01.rs
index 54768c10d..d3215c0e6 100644
--- a/postgres-types/src/jiff_01.rs
+++ b/postgres-types/src/jiff_01.rs
@@ -23,10 +23,27 @@ fn round_us<'a>() -> SpanRound<'a> {
     SpanRound::new().largest(Unit::Microsecond)
 }
 
+fn decode_err<E>(_e: E) -> Box<dyn Error + Sync + Send>
+where
+    E: Error,
+{
+    "value too large to decode".into()
+}
+
+fn transmit_err<E>(_e: E) -> Box<dyn Error + Sync + Send>
+where
+    E: Error,
+{
+    "value too large to transmit".into()
+}
+
 impl<'a> FromSql<'a> for DateTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<DateTime, Box<dyn Error + Sync + Send>> {
-        let t = types::timestamp_from_sql(raw)?;
-        Ok(base().checked_add(Span::new().microseconds(t))?)
+        let v = types::timestamp_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| base().checked_add(s))
+            .map_err(decode_err)
     }
 
     accepts!(TIMESTAMP);
@@ -34,8 +51,12 @@ impl<'a> FromSql<'a> for DateTime {
 
 impl ToSql for DateTime {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let span = self.since(base())?.round(round_us())?;
-        types::timestamp_to_sql(span.get_microseconds(), w);
+        let v = self
+            .since(base())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::timestamp_to_sql(v, w);
         Ok(IsNull::No)
     }
 
@@ -45,8 +66,11 @@ impl ToSql for DateTime {
 
 impl<'a> FromSql<'a> for Timestamp {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<Timestamp, Box<dyn Error + Sync + Send>> {
-        let t = types::timestamp_from_sql(raw)?;
-        Ok(base_ts().checked_add(Span::new().microseconds(t))?)
+        let v = types::timestamp_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| base_ts().checked_add(s))
+            .map_err(decode_err)
     }
 
     accepts!(TIMESTAMPTZ);
@@ -54,8 +78,12 @@ impl<'a> FromSql<'a> for Timestamp {
 
 impl ToSql for Timestamp {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let span = self.since(base_ts())?.round(round_us())?;
-        types::timestamp_to_sql(span.get_microseconds(), w);
+        let v = self
+            .since(base_ts())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::timestamp_to_sql(v, w);
         Ok(IsNull::No)
     }
 
@@ -65,17 +93,19 @@ impl ToSql for Timestamp {
 
 impl<'a> FromSql<'a> for Date {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<Date, Box<dyn Error + Sync + Send>> {
-        let jd = types::date_from_sql(raw)?;
-        Ok(base().date().checked_add(Span::new().days(jd))?)
+        let v = types::date_from_sql(raw)?;
+        Span::new()
+            .try_days(v)
+            .and_then(|s| base().date().checked_add(s))
+            .map_err(decode_err)
     }
-
     accepts!(DATE);
 }
 
 impl ToSql for Date {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let jd = self.since(base().date())?.get_days();
-        types::date_to_sql(jd, w);
+        let v = self.since(base().date()).map_err(transmit_err)?.get_days();
+        types::date_to_sql(v, w);
         Ok(IsNull::No)
     }
 
@@ -85,8 +115,11 @@ impl ToSql for Date {
 
 impl<'a> FromSql<'a> for Time {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<Time, Box<dyn Error + Sync + Send>> {
-        let usec = types::time_from_sql(raw)?;
-        Ok(Time::midnight() + Span::new().microseconds(usec))
+        let v = types::time_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| Time::midnight().checked_add(s))
+            .map_err(decode_err)
     }
 
     accepts!(TIME);
@@ -94,8 +127,12 @@ impl<'a> FromSql<'a> for Time {
 
 impl ToSql for Time {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let span = self.since(Time::midnight())?.round(round_us())?;
-        types::time_to_sql(span.get_microseconds(), w);
+        let v = self
+            .since(Time::midnight())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::time_to_sql(v, w);
         Ok(IsNull::No)
     }
 
diff --git a/tokio-postgres/tests/test/types/jiff_01.rs b/tokio-postgres/tests/test/types/jiff_01.rs
new file mode 100644
index 000000000..7c9052676
--- /dev/null
+++ b/tokio-postgres/tests/test/types/jiff_01.rs
@@ -0,0 +1,175 @@
+use jiff_01::{
+    civil::{Date as JiffDate, DateTime, Time},
+    Timestamp as JiffTimestamp,
+};
+use std::fmt;
+use tokio_postgres::{
+    types::{Date, FromSqlOwned, Timestamp},
+    Client,
+};
+
+use crate::connect;
+use crate::types::test_type;
+
+#[tokio::test]
+async fn test_datetime_params() {
+    fn make_check(s: &str) -> (Option<DateTime>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_datetime_params() {
+    fn make_check(s: &str) -> (Timestamp<DateTime>, &str) {
+        (Timestamp::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_timestamp_params() {
+    fn make_check(s: &str) -> (Option<JiffTimestamp>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_timestamp_params() {
+    fn make_check(s: &str) -> (Timestamp<JiffTimestamp>, &str) {
+        (Timestamp::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_date_params() {
+    fn make_check(s: &str) -> (Option<JiffDate>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_date_params() {
+    fn make_check(s: &str) -> (Date<JiffDate>, &str) {
+        (Date::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (Date::PosInfinity, "'infinity'"),
+            (Date::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_time_params() {
+    fn make_check(s: &str) -> (Option<Time>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIME",
+        &[
+            make_check("'00:00:00.010000000'"),
+            make_check("'11:19:33.100314000'"),
+            make_check("'23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_special_params_without_wrapper() {
+    async fn assert_overflows<T>(client: &mut Client, val: &str, sql_type: &str)
+    where
+        T: FromSqlOwned + fmt::Debug,
+    {
+        let err = client
+            .query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
+            .await
+            .unwrap()
+            .try_get::<_, T>(0)
+            .unwrap_err();
+
+        assert_eq!(
+            err.to_string(),
+            "error deserializing column 0: value too large to decode"
+        );
+
+        let err = client
+            .query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
+            .await
+            .unwrap()
+            .try_get::<_, T>(0)
+            .unwrap_err();
+
+        assert_eq!(
+            err.to_string(),
+            "error deserializing column 0: value too large to decode"
+        );
+    }
+
+    let mut client = connect("user=postgres").await;
+
+    assert_overflows::<DateTime>(&mut client, "'-infinity'", "timestamp").await;
+    assert_overflows::<DateTime>(&mut client, "'infinity'", "timestamp").await;
+    assert_overflows::<JiffTimestamp>(&mut client, "'-infinity'", "timestamptz").await;
+    assert_overflows::<JiffTimestamp>(&mut client, "'infinity'", "timestamptz").await;
+    assert_overflows::<JiffDate>(&mut client, "'-infinity'", "date").await;
+    assert_overflows::<JiffDate>(&mut client, "'infinity'", "date").await;
+}
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index 62d54372a..f962bf10a 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -23,6 +23,8 @@ mod eui48_1;
 mod geo_types_06;
 #[cfg(feature = "with-geo-types-0_7")]
 mod geo_types_07;
+#[cfg(feature = "with-jiff-0_1")]
+mod jiff_01;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-smol_str-01")]

From bc9102c82e32606328478b6757b199d322aed46b Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Wed, 14 Aug 2024 21:24:58 -0400
Subject: [PATCH 052/106] Remove `Zoned` from docs

The implementation was previously removed as per jiff author comment.
---
 postgres-types/src/lib.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 7d6d976c6..6ad2eff50 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -493,11 +493,10 @@ impl WrongType {
 /// | `time::OffsetDateTime`          | TIMESTAMP WITH TIME ZONE            |
 /// | `time::Date`                    | DATE                                |
 /// | `time::Time`                    | TIME                                |
-/// | `jiff::civil::DateTime`         | TIMESTAMP                           |
-/// | `jiff::Timestamp`               | TIMESTAMP WITH TIME ZONE            |
-/// | `jiff::Zoned`                   | TIMESTAMP WITH TIME ZONE            |
 /// | `jiff::civil::Date`             | DATE                                |
+/// | `jiff::civil::DateTime`         | TIMESTAMP                           |
 /// | `jiff::civil::Time`             | TIME                                |
+/// | `jiff::Timestamp`               | TIMESTAMP WITH TIME ZONE            |
 /// | `eui48::MacAddress`             | MACADDR                             |
 /// | `geo_types::Point<f64>`         | POINT                               |
 /// | `geo_types::Rect<f64>`          | BOX                                 |

From 5b26b5d2d61bbb0607439346876f0d952220a869 Mon Sep 17 00:00:00 2001
From: Allan Zhang <allanzhang7@gmail.com>
Date: Wed, 14 Aug 2024 22:26:22 -0400
Subject: [PATCH 053/106] Fix `chrono::DateTime<Utc>` tests

`test_date_time_params` and `test_with_special_date_time_params` could fail when run with a non-UTC system time zone.

In Postgres, if no time zone is stated in the input string, then it is assumed to be in system time.
This means that in these tests, a correctly parsed `DateTime<Utc>` could be compared to an incorrectly offset time.

The offset component is now included in the test strings of these tests. This component is already present in the test strings for `time::OffsetDateTime`.
---
 tokio-postgres/tests/test/types/chrono_04.rs | 30 +++++++++++---------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/tokio-postgres/tests/test/types/chrono_04.rs b/tokio-postgres/tests/test/types/chrono_04.rs
index b010055ba..eda8151a6 100644
--- a/tokio-postgres/tests/test/types/chrono_04.rs
+++ b/tokio-postgres/tests/test/types/chrono_04.rs
@@ -1,4 +1,4 @@
-use chrono_04::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
+use chrono_04::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use std::fmt;
 use tokio_postgres::types::{Date, FromSqlOwned, Timestamp};
 use tokio_postgres::Client;
@@ -53,18 +53,20 @@ async fn test_with_special_naive_date_time_params() {
 async fn test_date_time_params() {
     fn make_check(time: &str) -> (Option<DateTime<Utc>>, &str) {
         (
-            Some(Utc.from_utc_datetime(
-                &NaiveDateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'").unwrap(),
-            )),
+            Some(
+                DateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f%#z'")
+                    .unwrap()
+                    .to_utc(),
+            ),
             time,
         )
     }
     test_type(
         "TIMESTAMP WITH TIME ZONE",
         &[
-            make_check("'1970-01-01 00:00:00.010000000'"),
-            make_check("'1965-09-25 11:19:33.100314000'"),
-            make_check("'2010-02-09 23:11:45.120200000'"),
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
             (None, "NULL"),
         ],
     )
@@ -75,18 +77,20 @@ async fn test_date_time_params() {
 async fn test_with_special_date_time_params() {
     fn make_check(time: &str) -> (Timestamp<DateTime<Utc>>, &str) {
         (
-            Timestamp::Value(Utc.from_utc_datetime(
-                &NaiveDateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'").unwrap(),
-            )),
+            Timestamp::Value(
+                DateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f%#z'")
+                    .unwrap()
+                    .to_utc(),
+            ),
             time,
         )
     }
     test_type(
         "TIMESTAMP WITH TIME ZONE",
         &[
-            make_check("'1970-01-01 00:00:00.010000000'"),
-            make_check("'1965-09-25 11:19:33.100314000'"),
-            make_check("'2010-02-09 23:11:45.120200000'"),
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
             (Timestamp::PosInfinity, "'infinity'"),
             (Timestamp::NegInfinity, "'-infinity'"),
         ],

From b1ace91c40185de90882149f0d294c360f6585bd Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 15 Sep 2024 20:03:58 -0400
Subject: [PATCH 054/106] Release postgres-derive v0.4.6

---
 postgres-derive/CHANGELOG.md | 6 ++++++
 postgres-derive/Cargo.toml   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/postgres-derive/CHANGELOG.md b/postgres-derive/CHANGELOG.md
index b0075fa8e..1532b307c 100644
--- a/postgres-derive/CHANGELOG.md
+++ b/postgres-derive/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.4.6 - 2024-09-15
+
+### Changed
+
+* Upgraded `heck`.
+
 ## v0.4.5 - 2023-08-19
 
 ### Added
diff --git a/postgres-derive/Cargo.toml b/postgres-derive/Cargo.toml
index cbae6c77b..96600f124 100644
--- a/postgres-derive/Cargo.toml
+++ b/postgres-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-derive"
-version = "0.4.5"
+version = "0.4.6"
 authors = ["Steven Fackler <sfackler@palantir.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2018"

From 776ea308d8e525f4fe2dbc4ba032879c2c6e8cbb Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 15 Sep 2024 20:07:29 -0400
Subject: [PATCH 055/106] Release postgres-types v0.2.8

---
 postgres-types/CHANGELOG.md | 2 ++
 postgres-types/Cargo.toml   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/postgres-types/CHANGELOG.md b/postgres-types/CHANGELOG.md
index b11e18d32..777f999a7 100644
--- a/postgres-types/CHANGELOG.md
+++ b/postgres-types/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## v0.2.8 - 2024-09-15
+
 ### Added
 
 * Added support for `jiff` 0.1 via the `with-jiff-01` feature.
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index 941f4fcc4..ec8cea4dc 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-types"
-version = "0.2.7"
+version = "0.2.8"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -33,7 +33,7 @@ with-time-0_3 = ["time-03"]
 bytes = "1.0"
 fallible-iterator = "0.2"
 postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
-postgres-derive = { version = "0.4.5", optional = true, path = "../postgres-derive" }
+postgres-derive = { version = "0.4.6", optional = true, path = "../postgres-derive" }
 
 array-init = { version = "2", optional = true }
 bit-vec-06 = { version = "0.6", package = "bit-vec", optional = true }

From 8d08adb62bd96a29106800a798883a234a4c7e1f Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 15 Sep 2024 20:11:09 -0400
Subject: [PATCH 056/106] Release tokio-postgres v0.7.12

---
 tokio-postgres/CHANGELOG.md | 7 +++++++
 tokio-postgres/Cargo.toml   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index bf17ec486..9ee470db6 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -2,9 +2,16 @@
 
 ## Unreleased
 
+## v0.7.12 - 2024-09-15
+
+### Fixed
+
+* Fixed `query_typed` queries that return no rows.
+
 ### Added
 
 * Added support for `jiff` 0.1 via the `with-jiff-01` feature.
+* Added support for TCP keepalive on AIX.
 
 ## v0.7.11 - 2024-07-21
 
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index e1e84f7b1..ee6fefb81 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokio-postgres"
-version = "0.7.11"
+version = "0.7.12"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -56,7 +56,7 @@ percent-encoding = "2.0"
 pin-project-lite = "0.2"
 phf = "0.11"
 postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
-postgres-types = { version = "0.2.7", path = "../postgres-types" }
+postgres-types = { version = "0.2.8", path = "../postgres-types" }
 tokio = { version = "1.27", features = ["io-util"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 rand = "0.8.5"

From 6ae17e0f2d174fc4d5592ac7869909d7bdd346d9 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 15 Sep 2024 20:14:38 -0400
Subject: [PATCH 057/106] Release postgres v0.19.9

---
 postgres/CHANGELOG.md | 2 ++
 postgres/Cargo.toml   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
index 6feb629e4..c3e686714 100644
--- a/postgres/CHANGELOG.md
+++ b/postgres/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## v0.19.9 - 2024-09-15
+
 ### Added
 
 * Added support for `jiff` 0.1 via the `with-jiff-01` feature.
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index e0e580f7d..9e360c2a4 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres"
-version = "0.19.8"
+version = "0.19.9"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -41,7 +41,7 @@ bytes = "1.0"
 fallible-iterator = "0.2"
 futures-util = { version = "0.3.14", features = ["sink"] }
 log = "0.4"
-tokio-postgres = { version = "0.7.11", path = "../tokio-postgres" }
+tokio-postgres = { version = "0.7.12", path = "../tokio-postgres" }
 tokio = { version = "1.0", features = ["rt", "time"] }
 
 [dev-dependencies]

From 60c11825f4254c493ea553d66ed858e87cd991ca Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Fri, 5 Jul 2024 15:06:41 +0800
Subject: [PATCH 058/106] feat: add ssl_negotiation option

---
 postgres/src/config.rs                 | 14 +++++++++
 tokio-postgres/src/cancel_query.rs     | 15 ++++++++--
 tokio-postgres/src/cancel_query_raw.rs |  5 ++--
 tokio-postgres/src/cancel_token.rs     |  5 +++-
 tokio-postgres/src/client.rs           |  6 +++-
 tokio-postgres/src/config.rs           | 39 ++++++++++++++++++++++++++
 tokio-postgres/src/connect_raw.rs      | 17 +++++++++--
 tokio-postgres/src/connect_tls.rs      | 25 +++++++++--------
 tokio-postgres/tests/test/parse.rs     |  6 +++-
 9 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/postgres/src/config.rs b/postgres/src/config.rs
index a32ddc78e..f8acbaa4d 100644
--- a/postgres/src/config.rs
+++ b/postgres/src/config.rs
@@ -10,6 +10,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::runtime;
+use tokio_postgres::config::SslNegotiation;
 #[doc(inline)]
 pub use tokio_postgres::config::{
     ChannelBinding, Host, LoadBalanceHosts, SslMode, TargetSessionAttrs,
@@ -40,6 +41,8 @@ use tokio_postgres::{Error, Socket};
 ///     path to the directory containing Unix domain sockets. Otherwise, it is treated as a hostname. Multiple hosts
 ///     can be specified, separated by commas. Each host will be tried in turn when connecting. Required if connecting
 ///     with the `connect` method.
+/// * `sslnegotiation` - TLS negotiation method. If set to `direct`, the client will perform direct TLS handshake, this only works for PostgreSQL 17 and newer.
+///     If set to `postgres`, the default value, it follows original postgres wire protocol to perform the negotiation.
 /// * `hostaddr` - Numeric IP address of host to connect to. This should be in the standard IPv4 address format,
 ///     e.g., 172.28.40.9. If your machine supports IPv6, you can also use those addresses.
 ///     If this parameter is not specified, the value of `host` will be looked up to find the corresponding IP address,
@@ -230,6 +233,17 @@ impl Config {
         self.config.get_ssl_mode()
     }
 
+    /// Sets the SSL negotiation method
+    pub fn ssl_negotiation(&mut self, ssl_negotiation: SslNegotiation) -> &mut Config {
+        self.config.ssl_negotiation(ssl_negotiation);
+        self
+    }
+
+    /// Gets the SSL negotiation method
+    pub fn get_ssl_negotiation(&self) -> SslNegotiation {
+        self.config.get_ssl_negotiation()
+    }
+
     /// Adds a host to the configuration.
     ///
     /// Multiple hosts can be specified by calling this method multiple times, and each will be tried in order. On Unix
diff --git a/tokio-postgres/src/cancel_query.rs b/tokio-postgres/src/cancel_query.rs
index 078d4b8b6..2dfd47c06 100644
--- a/tokio-postgres/src/cancel_query.rs
+++ b/tokio-postgres/src/cancel_query.rs
@@ -1,5 +1,5 @@
 use crate::client::SocketConfig;
-use crate::config::SslMode;
+use crate::config::{SslMode, SslNegotiation};
 use crate::tls::MakeTlsConnect;
 use crate::{cancel_query_raw, connect_socket, Error, Socket};
 use std::io;
@@ -7,6 +7,7 @@ use std::io;
 pub(crate) async fn cancel_query<T>(
     config: Option<SocketConfig>,
     ssl_mode: SslMode,
+    ssl_negotiation: SslNegotiation,
     mut tls: T,
     process_id: i32,
     secret_key: i32,
@@ -38,6 +39,14 @@ where
     )
     .await?;
 
-    cancel_query_raw::cancel_query_raw(socket, ssl_mode, tls, has_hostname, process_id, secret_key)
-        .await
+    cancel_query_raw::cancel_query_raw(
+        socket,
+        ssl_mode,
+        ssl_negotiation,
+        tls,
+        has_hostname,
+        process_id,
+        secret_key,
+    )
+    .await
 }
diff --git a/tokio-postgres/src/cancel_query_raw.rs b/tokio-postgres/src/cancel_query_raw.rs
index 41aafe7d9..886606497 100644
--- a/tokio-postgres/src/cancel_query_raw.rs
+++ b/tokio-postgres/src/cancel_query_raw.rs
@@ -1,4 +1,4 @@
-use crate::config::SslMode;
+use crate::config::{SslMode, SslNegotiation};
 use crate::tls::TlsConnect;
 use crate::{connect_tls, Error};
 use bytes::BytesMut;
@@ -8,6 +8,7 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
 pub async fn cancel_query_raw<S, T>(
     stream: S,
     mode: SslMode,
+    negotiation: SslNegotiation,
     tls: T,
     has_hostname: bool,
     process_id: i32,
@@ -17,7 +18,7 @@ where
     S: AsyncRead + AsyncWrite + Unpin,
     T: TlsConnect<S>,
 {
-    let mut stream = connect_tls::connect_tls(stream, mode, tls, has_hostname).await?;
+    let mut stream = connect_tls::connect_tls(stream, mode, negotiation, tls, has_hostname).await?;
 
     let mut buf = BytesMut::new();
     frontend::cancel_request(process_id, secret_key, &mut buf);
diff --git a/tokio-postgres/src/cancel_token.rs b/tokio-postgres/src/cancel_token.rs
index c925ce0ca..1652bec72 100644
--- a/tokio-postgres/src/cancel_token.rs
+++ b/tokio-postgres/src/cancel_token.rs
@@ -1,4 +1,4 @@
-use crate::config::SslMode;
+use crate::config::{SslMode, SslNegotiation};
 use crate::tls::TlsConnect;
 #[cfg(feature = "runtime")]
 use crate::{cancel_query, client::SocketConfig, tls::MakeTlsConnect, Socket};
@@ -12,6 +12,7 @@ pub struct CancelToken {
     #[cfg(feature = "runtime")]
     pub(crate) socket_config: Option<SocketConfig>,
     pub(crate) ssl_mode: SslMode,
+    pub(crate) ssl_negotiation: SslNegotiation,
     pub(crate) process_id: i32,
     pub(crate) secret_key: i32,
 }
@@ -37,6 +38,7 @@ impl CancelToken {
         cancel_query::cancel_query(
             self.socket_config.clone(),
             self.ssl_mode,
+            self.ssl_negotiation,
             tls,
             self.process_id,
             self.secret_key,
@@ -54,6 +56,7 @@ impl CancelToken {
         cancel_query_raw::cancel_query_raw(
             stream,
             self.ssl_mode,
+            self.ssl_negotiation,
             tls,
             true,
             self.process_id,
diff --git a/tokio-postgres/src/client.rs b/tokio-postgres/src/client.rs
index 92eabde36..b38bbba37 100644
--- a/tokio-postgres/src/client.rs
+++ b/tokio-postgres/src/client.rs
@@ -1,5 +1,5 @@
 use crate::codec::BackendMessages;
-use crate::config::SslMode;
+use crate::config::{SslMode, SslNegotiation};
 use crate::connection::{Request, RequestMessages};
 use crate::copy_out::CopyOutStream;
 #[cfg(feature = "runtime")]
@@ -180,6 +180,7 @@ pub struct Client {
     #[cfg(feature = "runtime")]
     socket_config: Option<SocketConfig>,
     ssl_mode: SslMode,
+    ssl_negotiation: SslNegotiation,
     process_id: i32,
     secret_key: i32,
 }
@@ -188,6 +189,7 @@ impl Client {
     pub(crate) fn new(
         sender: mpsc::UnboundedSender<Request>,
         ssl_mode: SslMode,
+        ssl_negotiation: SslNegotiation,
         process_id: i32,
         secret_key: i32,
     ) -> Client {
@@ -200,6 +202,7 @@ impl Client {
             #[cfg(feature = "runtime")]
             socket_config: None,
             ssl_mode,
+            ssl_negotiation,
             process_id,
             secret_key,
         }
@@ -550,6 +553,7 @@ impl Client {
             #[cfg(feature = "runtime")]
             socket_config: self.socket_config.clone(),
             ssl_mode: self.ssl_mode,
+            ssl_negotiation: self.ssl_negotiation,
             process_id: self.process_id,
             secret_key: self.secret_key,
         }
diff --git a/tokio-postgres/src/config.rs b/tokio-postgres/src/config.rs
index 62b45f793..e78f489f8 100644
--- a/tokio-postgres/src/config.rs
+++ b/tokio-postgres/src/config.rs
@@ -50,6 +50,16 @@ pub enum SslMode {
     Require,
 }
 
+/// TLS negotiation configuration
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum SslNegotiation {
+    /// Use PostgreSQL SslRequest for Ssl negotiation
+    Postgres,
+    /// Start Ssl handshake without negotiation, only works for PostgreSQL 17+
+    Direct,
+}
+
 /// Channel binding configuration.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[non_exhaustive]
@@ -106,6 +116,8 @@ pub enum Host {
 ///     path to the directory containing Unix domain sockets. Otherwise, it is treated as a hostname. Multiple hosts
 ///     can be specified, separated by commas. Each host will be tried in turn when connecting. Required if connecting
 ///     with the `connect` method.
+/// * `sslnegotiation` - TLS negotiation method. If set to `direct`, the client will perform direct TLS handshake, this only works for PostgreSQL 17 and newer.
+///     If set to `postgres`, the default value, it follows original postgres wire protocol to perform the negotiation.
 /// * `hostaddr` - Numeric IP address of host to connect to. This should be in the standard IPv4 address format,
 ///     e.g., 172.28.40.9. If your machine supports IPv6, you can also use those addresses.
 ///     If this parameter is not specified, the value of `host` will be looked up to find the corresponding IP address,
@@ -198,6 +210,7 @@ pub struct Config {
     pub(crate) options: Option<String>,
     pub(crate) application_name: Option<String>,
     pub(crate) ssl_mode: SslMode,
+    pub(crate) ssl_negotiation: SslNegotiation,
     pub(crate) host: Vec<Host>,
     pub(crate) hostaddr: Vec<IpAddr>,
     pub(crate) port: Vec<u16>,
@@ -227,6 +240,7 @@ impl Config {
             options: None,
             application_name: None,
             ssl_mode: SslMode::Prefer,
+            ssl_negotiation: SslNegotiation::Postgres,
             host: vec![],
             hostaddr: vec![],
             port: vec![],
@@ -325,6 +339,19 @@ impl Config {
         self.ssl_mode
     }
 
+    /// Sets the SSL negotiation method.
+    ///
+    /// Defaults to `postgres`.
+    pub fn ssl_negotiation(&mut self, ssl_negotiation: SslNegotiation) -> &mut Config {
+        self.ssl_negotiation = ssl_negotiation;
+        self
+    }
+
+    /// Gets the SSL negotiation method.
+    pub fn get_ssl_negotiation(&self) -> SslNegotiation {
+        self.ssl_negotiation
+    }
+
     /// Adds a host to the configuration.
     ///
     /// Multiple hosts can be specified by calling this method multiple times, and each will be tried in order. On Unix
@@ -550,6 +577,18 @@ impl Config {
                 };
                 self.ssl_mode(mode);
             }
+            "sslnegotiation" => {
+                let mode = match value {
+                    "postgres" => SslNegotiation::Postgres,
+                    "direct" => SslNegotiation::Direct,
+                    _ => {
+                        return Err(Error::config_parse(Box::new(InvalidValue(
+                            "sslnegotiation",
+                        ))))
+                    }
+                };
+                self.ssl_negotiation(mode);
+            }
             "host" => {
                 for host in value.split(',') {
                     self.host(host);
diff --git a/tokio-postgres/src/connect_raw.rs b/tokio-postgres/src/connect_raw.rs
index 19be9eb01..cf7476cab 100644
--- a/tokio-postgres/src/connect_raw.rs
+++ b/tokio-postgres/src/connect_raw.rs
@@ -89,7 +89,14 @@ where
     S: AsyncRead + AsyncWrite + Unpin,
     T: TlsConnect<S>,
 {
-    let stream = connect_tls(stream, config.ssl_mode, tls, has_hostname).await?;
+    let stream = connect_tls(
+        stream,
+        config.ssl_mode,
+        config.ssl_negotiation,
+        tls,
+        has_hostname,
+    )
+    .await?;
 
     let mut stream = StartupStream {
         inner: Framed::new(stream, PostgresCodec),
@@ -107,7 +114,13 @@ where
     let (process_id, secret_key, parameters) = read_info(&mut stream).await?;
 
     let (sender, receiver) = mpsc::unbounded();
-    let client = Client::new(sender, config.ssl_mode, process_id, secret_key);
+    let client = Client::new(
+        sender,
+        config.ssl_mode,
+        config.ssl_negotiation,
+        process_id,
+        secret_key,
+    );
     let connection = Connection::new(stream.inner, stream.delayed, parameters, receiver);
 
     Ok((client, connection))
diff --git a/tokio-postgres/src/connect_tls.rs b/tokio-postgres/src/connect_tls.rs
index 2b1229125..c7a093064 100644
--- a/tokio-postgres/src/connect_tls.rs
+++ b/tokio-postgres/src/connect_tls.rs
@@ -1,4 +1,4 @@
-use crate::config::SslMode;
+use crate::config::{SslMode, SslNegotiation};
 use crate::maybe_tls_stream::MaybeTlsStream;
 use crate::tls::private::ForcePrivateApi;
 use crate::tls::TlsConnect;
@@ -10,6 +10,7 @@ use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 pub async fn connect_tls<S, T>(
     mut stream: S,
     mode: SslMode,
+    negotiation: SslNegotiation,
     tls: T,
     has_hostname: bool,
 ) -> Result<MaybeTlsStream<S, T::Stream>, Error>
@@ -25,18 +26,20 @@ where
         SslMode::Prefer | SslMode::Require => {}
     }
 
-    let mut buf = BytesMut::new();
-    frontend::ssl_request(&mut buf);
-    stream.write_all(&buf).await.map_err(Error::io)?;
+    if negotiation == SslNegotiation::Postgres {
+        let mut buf = BytesMut::new();
+        frontend::ssl_request(&mut buf);
+        stream.write_all(&buf).await.map_err(Error::io)?;
 
-    let mut buf = [0];
-    stream.read_exact(&mut buf).await.map_err(Error::io)?;
+        let mut buf = [0];
+        stream.read_exact(&mut buf).await.map_err(Error::io)?;
 
-    if buf[0] != b'S' {
-        if SslMode::Require == mode {
-            return Err(Error::tls("server does not support TLS".into()));
-        } else {
-            return Ok(MaybeTlsStream::Raw(stream));
+        if buf[0] != b'S' {
+            if SslMode::Require == mode {
+                return Err(Error::tls("server does not support TLS".into()));
+            } else {
+                return Ok(MaybeTlsStream::Raw(stream));
+            }
         }
     }
 
diff --git a/tokio-postgres/tests/test/parse.rs b/tokio-postgres/tests/test/parse.rs
index 04d422e27..35eeca72b 100644
--- a/tokio-postgres/tests/test/parse.rs
+++ b/tokio-postgres/tests/test/parse.rs
@@ -1,5 +1,5 @@
 use std::time::Duration;
-use tokio_postgres::config::{Config, TargetSessionAttrs};
+use tokio_postgres::config::{Config, SslNegotiation, TargetSessionAttrs};
 
 fn check(s: &str, config: &Config) {
     assert_eq!(s.parse::<Config>().expect(s), *config, "`{}`", s);
@@ -42,6 +42,10 @@ fn settings() {
             .keepalives_idle(Duration::from_secs(30))
             .target_session_attrs(TargetSessionAttrs::ReadOnly),
     );
+    check(
+        "sslnegotiation=direct",
+        Config::new().ssl_negotiation(SslNegotiation::Direct),
+    );
 }
 
 #[test]

From 6a6fdb9957a65692346fafc76c60ea978c85c8a5 Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Sat, 6 Jul 2024 15:26:13 +0800
Subject: [PATCH 059/106] test: updte tests for direct tls

---
 docker-compose.yml              |  2 +-
 postgres-native-tls/Cargo.toml  |  2 +-
 postgres-native-tls/src/test.rs | 16 ++++++++++++++++
 postgres-openssl/src/test.rs    | 13 +++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0ed44148d..5593abb5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   postgres:
-    image: postgres:14
+    image: docker.io/postgres:17beta2
     ports:
       - 5433:5433
     volumes:
diff --git a/postgres-native-tls/Cargo.toml b/postgres-native-tls/Cargo.toml
index 02259b3dc..e86c7ce2d 100644
--- a/postgres-native-tls/Cargo.toml
+++ b/postgres-native-tls/Cargo.toml
@@ -16,7 +16,7 @@ default = ["runtime"]
 runtime = ["tokio-postgres/runtime"]
 
 [dependencies]
-native-tls = "0.2"
+native-tls = { version = "0.2", features = ["alpn"] }
 tokio = "1.0"
 tokio-native-tls = "0.3"
 tokio-postgres = { version = "0.7.11", path = "../tokio-postgres", default-features = false }
diff --git a/postgres-native-tls/src/test.rs b/postgres-native-tls/src/test.rs
index 25cc6fdbd..a02d96034 100644
--- a/postgres-native-tls/src/test.rs
+++ b/postgres-native-tls/src/test.rs
@@ -42,6 +42,22 @@ async fn require() {
     .await;
 }
 
+#[tokio::test]
+async fn direct() {
+    let connector = native_tls::TlsConnector::builder()
+        .add_root_certificate(
+            Certificate::from_pem(include_bytes!("../../test/server.crt")).unwrap(),
+        )
+        .request_alpns(&["postgresql"])
+        .build()
+        .unwrap();
+    smoke_test(
+        "user=ssl_user dbname=postgres sslmode=require sslnegotiation=direct",
+        TlsConnector::new(connector, "localhost"),
+    )
+    .await;
+}
+
 #[tokio::test]
 async fn prefer() {
     let connector = native_tls::TlsConnector::builder()
diff --git a/postgres-openssl/src/test.rs b/postgres-openssl/src/test.rs
index b361ee446..780f9d16d 100644
--- a/postgres-openssl/src/test.rs
+++ b/postgres-openssl/src/test.rs
@@ -37,6 +37,19 @@ async fn require() {
     .await;
 }
 
+#[tokio::test]
+async fn direct() {
+    let mut builder = SslConnector::builder(SslMethod::tls()).unwrap();
+    builder.set_ca_file("../test/server.crt").unwrap();
+    builder.set_alpn_protos(b"\x0apostgresql").unwrap();
+    let ctx = builder.build();
+    smoke_test(
+        "user=ssl_user dbname=postgres sslmode=require sslnegotiation=direct",
+        TlsConnector::new(ctx.configure().unwrap(), "localhost"),
+    )
+    .await;
+}
+
 #[tokio::test]
 async fn prefer() {
     let mut builder = SslConnector::builder(SslMethod::tls()).unwrap();

From 9441ce101749cac4245ae20fa6b75d33e273c232 Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Sat, 6 Jul 2024 15:38:33 +0800
Subject: [PATCH 060/106] feat: provide built-in functions for setting ALPN

---
 postgres-native-tls/src/lib.rs  |  8 ++++++++
 postgres-native-tls/src/test.rs | 14 ++++++--------
 postgres-openssl/src/lib.rs     |  9 ++++++++-
 postgres-openssl/src/test.rs    |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/postgres-native-tls/src/lib.rs b/postgres-native-tls/src/lib.rs
index a06f185b5..c599165a1 100644
--- a/postgres-native-tls/src/lib.rs
+++ b/postgres-native-tls/src/lib.rs
@@ -53,6 +53,7 @@
 //! ```
 #![warn(rust_2018_idioms, clippy::all, missing_docs)]
 
+use native_tls::TlsConnectorBuilder;
 use std::future::Future;
 use std::io;
 use std::pin::Pin;
@@ -180,3 +181,10 @@ where
         }
     }
 }
+
+/// Set ALPN for `TlsConnectorBuilder`
+///
+/// This is required when using `sslnegotiation=direct`
+pub fn set_postgresql_alpn(builder: &mut TlsConnectorBuilder) -> &mut TlsConnectorBuilder {
+    builder.request_alpns(&["postgresql"])
+}
diff --git a/postgres-native-tls/src/test.rs b/postgres-native-tls/src/test.rs
index a02d96034..b34fa7351 100644
--- a/postgres-native-tls/src/test.rs
+++ b/postgres-native-tls/src/test.rs
@@ -5,7 +5,7 @@ use tokio_postgres::tls::TlsConnect;
 
 #[cfg(feature = "runtime")]
 use crate::MakeTlsConnector;
-use crate::TlsConnector;
+use crate::{set_postgresql_alpn, TlsConnector};
 
 async fn smoke_test<T>(s: &str, tls: T)
 where
@@ -44,13 +44,11 @@ async fn require() {
 
 #[tokio::test]
 async fn direct() {
-    let connector = native_tls::TlsConnector::builder()
-        .add_root_certificate(
-            Certificate::from_pem(include_bytes!("../../test/server.crt")).unwrap(),
-        )
-        .request_alpns(&["postgresql"])
-        .build()
-        .unwrap();
+    let connector = set_postgresql_alpn(native_tls::TlsConnector::builder().add_root_certificate(
+        Certificate::from_pem(include_bytes!("../../test/server.crt")).unwrap(),
+    ))
+    .build()
+    .unwrap();
     smoke_test(
         "user=ssl_user dbname=postgres sslmode=require sslnegotiation=direct",
         TlsConnector::new(connector, "localhost"),
diff --git a/postgres-openssl/src/lib.rs b/postgres-openssl/src/lib.rs
index 837663fe7..232cccd05 100644
--- a/postgres-openssl/src/lib.rs
+++ b/postgres-openssl/src/lib.rs
@@ -53,7 +53,7 @@ use openssl::hash::MessageDigest;
 use openssl::nid::Nid;
 #[cfg(feature = "runtime")]
 use openssl::ssl::SslConnector;
-use openssl::ssl::{self, ConnectConfiguration, SslRef};
+use openssl::ssl::{self, ConnectConfiguration, SslConnectorBuilder, SslRef};
 use openssl::x509::X509VerifyResult;
 use std::error::Error;
 use std::fmt::{self, Debug};
@@ -250,3 +250,10 @@ fn tls_server_end_point(ssl: &SslRef) -> Option<Vec<u8>> {
     };
     cert.digest(md).ok().map(|b| b.to_vec())
 }
+
+/// Set ALPN for `SslConnectorBuilder`
+///
+/// This is required when using `sslnegotiation=direct`
+pub fn set_postgresql_alpn(builder: &mut SslConnectorBuilder) -> Result<(), ErrorStack> {
+    builder.set_alpn_protos(b"\x0apostgresql")
+}
diff --git a/postgres-openssl/src/test.rs b/postgres-openssl/src/test.rs
index 780f9d16d..66bb22641 100644
--- a/postgres-openssl/src/test.rs
+++ b/postgres-openssl/src/test.rs
@@ -41,7 +41,7 @@ async fn require() {
 async fn direct() {
     let mut builder = SslConnector::builder(SslMethod::tls()).unwrap();
     builder.set_ca_file("../test/server.crt").unwrap();
-    builder.set_alpn_protos(b"\x0apostgresql").unwrap();
+    set_postgresql_alpn(&mut builder).unwrap();
     let ctx = builder.build();
     smoke_test(
         "user=ssl_user dbname=postgres sslmode=require sslnegotiation=direct",

From cfdc66f6f56a7fa40934d1b9f4c9ae7656838fed Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Sat, 6 Jul 2024 22:07:26 +0800
Subject: [PATCH 061/106] refactor: pub use sslnegotiation

---
 postgres/src/config.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/postgres/src/config.rs b/postgres/src/config.rs
index f8acbaa4d..8c4949825 100644
--- a/postgres/src/config.rs
+++ b/postgres/src/config.rs
@@ -10,10 +10,9 @@ use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::runtime;
-use tokio_postgres::config::SslNegotiation;
 #[doc(inline)]
 pub use tokio_postgres::config::{
-    ChannelBinding, Host, LoadBalanceHosts, SslMode, TargetSessionAttrs,
+    ChannelBinding, Host, LoadBalanceHosts, SslMode, SslNegotiation, TargetSessionAttrs,
 };
 use tokio_postgres::error::DbError;
 use tokio_postgres::tls::{MakeTlsConnect, TlsConnect};

From db308ef095f29a6bc348db953af62fc9b1d1962d Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Sun, 7 Jul 2024 10:12:41 +0800
Subject: [PATCH 062/106] refactor: apply review comments

---
 postgres-native-tls/src/lib.rs | 4 ++--
 postgres/src/config.rs         | 1 +
 tokio-postgres/src/config.rs   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/postgres-native-tls/src/lib.rs b/postgres-native-tls/src/lib.rs
index c599165a1..9ee7da653 100644
--- a/postgres-native-tls/src/lib.rs
+++ b/postgres-native-tls/src/lib.rs
@@ -185,6 +185,6 @@ where
 /// Set ALPN for `TlsConnectorBuilder`
 ///
 /// This is required when using `sslnegotiation=direct`
-pub fn set_postgresql_alpn(builder: &mut TlsConnectorBuilder) -> &mut TlsConnectorBuilder {
-    builder.request_alpns(&["postgresql"])
+pub fn set_postgresql_alpn(builder: &mut TlsConnectorBuilder) {
+    builder.request_alpns(&["postgresql"]);
 }
diff --git a/postgres/src/config.rs b/postgres/src/config.rs
index 8c4949825..ae710d16b 100644
--- a/postgres/src/config.rs
+++ b/postgres/src/config.rs
@@ -41,6 +41,7 @@ use tokio_postgres::{Error, Socket};
 ///     can be specified, separated by commas. Each host will be tried in turn when connecting. Required if connecting
 ///     with the `connect` method.
 /// * `sslnegotiation` - TLS negotiation method. If set to `direct`, the client will perform direct TLS handshake, this only works for PostgreSQL 17 and newer.
+///     Note that you will need to setup ALPN of TLS client configuration to `postgresql` when using direct TLS.
 ///     If set to `postgres`, the default value, it follows original postgres wire protocol to perform the negotiation.
 /// * `hostaddr` - Numeric IP address of host to connect to. This should be in the standard IPv4 address format,
 ///     e.g., 172.28.40.9. If your machine supports IPv6, you can also use those addresses.
diff --git a/tokio-postgres/src/config.rs b/tokio-postgres/src/config.rs
index e78f489f8..fb673b9b9 100644
--- a/tokio-postgres/src/config.rs
+++ b/tokio-postgres/src/config.rs
@@ -117,6 +117,7 @@ pub enum Host {
 ///     can be specified, separated by commas. Each host will be tried in turn when connecting. Required if connecting
 ///     with the `connect` method.
 /// * `sslnegotiation` - TLS negotiation method. If set to `direct`, the client will perform direct TLS handshake, this only works for PostgreSQL 17 and newer.
+///     Note that you will need to setup ALPN of TLS client configuration to `postgresql` when using direct TLS.
 ///     If set to `postgres`, the default value, it follows original postgres wire protocol to perform the negotiation.
 /// * `hostaddr` - Numeric IP address of host to connect to. This should be in the standard IPv4 address format,
 ///     e.g., 172.28.40.9. If your machine supports IPv6, you can also use those addresses.

From 331e968a9f3f4d8e5aa6beefa291c55eff6f52c6 Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Thu, 26 Sep 2024 19:26:36 -0700
Subject: [PATCH 063/106] chore: update postgres for ci

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5593abb5a..991df2d01 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   postgres:
-    image: docker.io/postgres:17beta2
+    image: docker.io/postgres:17
     ports:
       - 5433:5433
     volumes:

From eea7f13cea9f96e4ebc8176a3357922e25bef013 Mon Sep 17 00:00:00 2001
From: Sidney Cammeresi <sac@readyset.io>
Date: Fri, 25 Oct 2024 13:43:57 -0700
Subject: [PATCH 064/106] Add support for cidr 0.3 under separate feature

---
 postgres-types/Cargo.toml     |  2 ++
 postgres-types/src/cidr_03.rs | 44 +++++++++++++++++++++++++++++++++++
 postgres-types/src/lib.rs     |  2 ++
 3 files changed, 48 insertions(+)
 create mode 100644 postgres-types/src/cidr_03.rs

diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index ec8cea4dc..d417664ea 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -16,6 +16,7 @@ array-impls = ["array-init"]
 js = ["postgres-protocol/js"]
 with-bit-vec-0_6 = ["bit-vec-06"]
 with-cidr-0_2 = ["cidr-02"]
+with-cidr-0_3 = ["cidr-03"]
 with-chrono-0_4 = ["chrono-04"]
 with-eui48-0_4 = ["eui48-04"]
 with-eui48-1 = ["eui48-1"]
@@ -41,6 +42,7 @@ chrono-04 = { version = "0.4.16", package = "chrono", default-features = false,
     "clock",
 ], optional = true }
 cidr-02 = { version = "0.2", package = "cidr", optional = true }
+cidr-03 = { version = "0.3", package = "cidr", optional = true }
 # eui48-04 will stop compiling and support will be removed
 # See https://github.com/sfackler/rust-postgres/issues/1073
 eui48-04 = { version = "0.4", package = "eui48", optional = true }
diff --git a/postgres-types/src/cidr_03.rs b/postgres-types/src/cidr_03.rs
new file mode 100644
index 000000000..6a0178711
--- /dev/null
+++ b/postgres-types/src/cidr_03.rs
@@ -0,0 +1,44 @@
+use bytes::BytesMut;
+use cidr_03::{IpCidr, IpInet};
+use postgres_protocol::types;
+use std::error::Error;
+
+use crate::{FromSql, IsNull, ToSql, Type};
+
+impl<'a> FromSql<'a> for IpCidr {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {
+        let inet = types::inet_from_sql(raw)?;
+        Ok(IpCidr::new(inet.addr(), inet.netmask())?)
+    }
+
+    accepts!(CIDR);
+}
+
+impl ToSql for IpCidr {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        types::inet_to_sql(self.first_address(), self.network_length(), w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(CIDR);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for IpInet {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {
+        let inet = types::inet_from_sql(raw)?;
+        Ok(IpInet::new(inet.addr(), inet.netmask())?)
+    }
+
+    accepts!(INET);
+}
+
+impl ToSql for IpInet {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        types::inet_to_sql(self.address(), self.network_length(), w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(INET);
+    to_sql_checked!();
+}
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 6ad2eff50..c5593cff8 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -268,6 +268,8 @@ mod bit_vec_06;
 mod chrono_04;
 #[cfg(feature = "with-cidr-0_2")]
 mod cidr_02;
+#[cfg(feature = "with-cidr-0_3")]
+mod cidr_03;
 #[cfg(feature = "with-eui48-0_4")]
 mod eui48_04;
 #[cfg(feature = "with-eui48-1")]

From 7eb6f8e91b2b0841c02ee88b475e7a463050a974 Mon Sep 17 00:00:00 2001
From: Harris Kaufmann <harris.kaufmann@wibu.com>
Date: Wed, 18 Dec 2024 14:17:00 +0100
Subject: [PATCH 065/106] add `load_balance_hosts` to `Debug` impl for `Config`

---
 tokio-postgres/src/config.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tokio-postgres/src/config.rs b/tokio-postgres/src/config.rs
index 62b45f793..5bca418bd 100644
--- a/tokio-postgres/src/config.rs
+++ b/tokio-postgres/src/config.rs
@@ -744,6 +744,7 @@ impl fmt::Debug for Config {
         config_dbg
             .field("target_session_attrs", &self.target_session_attrs)
             .field("channel_binding", &self.channel_binding)
+            .field("load_balance_hosts", &self.load_balance_hosts)
             .finish()
     }
 }

From 76a1637d89788e123a664cf8040e8a5ce1b4fcb0 Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Sun, 19 Jan 2025 23:53:23 -0500
Subject: [PATCH 066/106] Fix time 0.3 infinity panics

Getting `PrimitiveDateTime` panics if the value is infinity.
This commit fixes the panic.

An infinity test is added, mirroring the existing one for chrono.
---
 postgres-types/src/time_02.rs              |  4 ++-
 postgres-types/src/time_03.rs              |  9 +++--
 tokio-postgres/tests/test/types/time_03.rs | 38 +++++++++++++++++++++-
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/postgres-types/src/time_02.rs b/postgres-types/src/time_02.rs
index 19a8909e7..1f2ba1ce1 100644
--- a/postgres-types/src/time_02.rs
+++ b/postgres-types/src/time_02.rs
@@ -14,7 +14,9 @@ const fn base() -> PrimitiveDateTime {
 impl<'a> FromSql<'a> for PrimitiveDateTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<PrimitiveDateTime, Box<dyn Error + Sync + Send>> {
         let t = types::timestamp_from_sql(raw)?;
-        Ok(base() + Duration::microseconds(t))
+        Ok(base()
+            .checked_add(Duration::microseconds(t))
+            .ok_or("value too large to decode")?)
     }
 
     accepts!(TIMESTAMP);
diff --git a/postgres-types/src/time_03.rs b/postgres-types/src/time_03.rs
index f136fab7c..4deea663f 100644
--- a/postgres-types/src/time_03.rs
+++ b/postgres-types/src/time_03.rs
@@ -13,7 +13,9 @@ fn base() -> PrimitiveDateTime {
 impl<'a> FromSql<'a> for PrimitiveDateTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<PrimitiveDateTime, Box<dyn Error + Sync + Send>> {
         let t = types::timestamp_from_sql(raw)?;
-        Ok(base() + Duration::microseconds(t))
+        Ok(base()
+            .checked_add(Duration::microseconds(t))
+            .ok_or("value too large to decode")?)
     }
 
     accepts!(TIMESTAMP);
@@ -62,7 +64,10 @@ impl ToSql for OffsetDateTime {
 impl<'a> FromSql<'a> for Date {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<Date, Box<dyn Error + Sync + Send>> {
         let jd = types::date_from_sql(raw)?;
-        Ok(base().date() + Duration::days(i64::from(jd)))
+        Ok(base()
+            .date()
+            .checked_add(Duration::days(i64::from(jd)))
+            .ok_or("value too large to decode")?)
     }
 
     accepts!(DATE);
diff --git a/tokio-postgres/tests/test/types/time_03.rs b/tokio-postgres/tests/test/types/time_03.rs
index df013c9bf..fca940a97 100644
--- a/tokio-postgres/tests/test/types/time_03.rs
+++ b/tokio-postgres/tests/test/types/time_03.rs
@@ -1,5 +1,11 @@
+use std::fmt;
+
+use postgres_types::FromSqlOwned;
 use time_03::{format_description, OffsetDateTime, PrimitiveDateTime};
-use tokio_postgres::types::{Date, Timestamp};
+use tokio_postgres::{
+    types::{Date, Timestamp},
+    Client,
+};
 
 use crate::types::test_type;
 
@@ -147,3 +153,33 @@ async fn test_time_params() {
     )
     .await;
 }
+
+#[tokio::test]
+async fn test_special_params_without_wrapper() {
+    async fn assert_overflows<T>(client: &mut Client, val: &str, sql_type: &str)
+    where
+        T: FromSqlOwned + fmt::Debug,
+    {
+        let err = client
+            .query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
+            .await
+            .unwrap()
+            .try_get::<_, T>(0)
+            .unwrap_err();
+        assert_eq!(
+            err.to_string(),
+            "error deserializing column 0: value too large to decode"
+        );
+    }
+
+    let mut client = crate::connect("user=postgres").await;
+
+    assert_overflows::<OffsetDateTime>(&mut client, "'-infinity'", "timestamptz").await;
+    assert_overflows::<OffsetDateTime>(&mut client, "'infinity'", "timestamptz").await;
+
+    assert_overflows::<PrimitiveDateTime>(&mut client, "'-infinity'", "timestamp").await;
+    assert_overflows::<PrimitiveDateTime>(&mut client, "'infinity'", "timestamp").await;
+
+    assert_overflows::<time_03::Date>(&mut client, "'-infinity'", "date").await;
+    assert_overflows::<time_03::Date>(&mut client, "'infinity'", "date").await;
+}

From 24d3234a38c79e1c063396015d70c9ffd5c010f0 Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 01:40:22 -0500
Subject: [PATCH 067/106] Fix clippy needless_lifetimes

---
 postgres-protocol/src/message/backend.rs  |  8 ++++----
 postgres-protocol/src/types/mod.rs        |  4 ++--
 postgres-types/src/lib.rs                 | 20 ++++++++++----------
 postgres/src/notifications.rs             |  6 +++---
 postgres/src/transaction.rs               |  2 +-
 tokio-postgres/src/query.rs               |  2 +-
 tokio-postgres/src/row.rs                 |  4 ++--
 tokio-postgres/src/to_statement.rs        |  2 +-
 tokio-postgres/src/transaction.rs         |  2 +-
 tokio-postgres/src/transaction_builder.rs |  2 +-
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/postgres-protocol/src/message/backend.rs b/postgres-protocol/src/message/backend.rs
index 73b169288..013bfbb81 100644
--- a/postgres-protocol/src/message/backend.rs
+++ b/postgres-protocol/src/message/backend.rs
@@ -475,7 +475,7 @@ pub struct ColumnFormats<'a> {
     remaining: u16,
 }
 
-impl<'a> FallibleIterator for ColumnFormats<'a> {
+impl FallibleIterator for ColumnFormats<'_> {
     type Item = u16;
     type Error = io::Error;
 
@@ -557,7 +557,7 @@ pub struct DataRowRanges<'a> {
     remaining: u16,
 }
 
-impl<'a> FallibleIterator for DataRowRanges<'a> {
+impl FallibleIterator for DataRowRanges<'_> {
     type Item = Option<Range<usize>>;
     type Error = io::Error;
 
@@ -645,7 +645,7 @@ pub struct ErrorField<'a> {
     value: &'a [u8],
 }
 
-impl<'a> ErrorField<'a> {
+impl ErrorField<'_> {
     #[inline]
     pub fn type_(&self) -> u8 {
         self.type_
@@ -717,7 +717,7 @@ pub struct Parameters<'a> {
     remaining: u16,
 }
 
-impl<'a> FallibleIterator for Parameters<'a> {
+impl FallibleIterator for Parameters<'_> {
     type Item = Oid;
     type Error = io::Error;
 
diff --git a/postgres-protocol/src/types/mod.rs b/postgres-protocol/src/types/mod.rs
index 05f515f76..37dc793b1 100644
--- a/postgres-protocol/src/types/mod.rs
+++ b/postgres-protocol/src/types/mod.rs
@@ -582,7 +582,7 @@ impl<'a> Array<'a> {
 /// An iterator over the dimensions of an array.
 pub struct ArrayDimensions<'a>(&'a [u8]);
 
-impl<'a> FallibleIterator for ArrayDimensions<'a> {
+impl FallibleIterator for ArrayDimensions<'_> {
     type Item = ArrayDimension;
     type Error = StdBox<dyn Error + Sync + Send>;
 
@@ -950,7 +950,7 @@ pub struct PathPoints<'a> {
     buf: &'a [u8],
 }
 
-impl<'a> FallibleIterator for PathPoints<'a> {
+impl FallibleIterator for PathPoints<'_> {
     type Item = Point;
     type Error = StdBox<dyn Error + Sync + Send>;
 
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 6ad2eff50..e57f29fbb 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -914,7 +914,7 @@ pub enum Format {
     Binary,
 }
 
-impl<'a, T> ToSql for &'a T
+impl<T> ToSql for &T
 where
     T: ToSql,
 {
@@ -963,7 +963,7 @@ impl<T: ToSql> ToSql for Option<T> {
     to_sql_checked!();
 }
 
-impl<'a, T: ToSql> ToSql for &'a [T] {
+impl<T: ToSql> ToSql for &[T] {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         let member_type = match *ty.kind() {
             Kind::Array(ref member) => member,
@@ -1004,7 +1004,7 @@ impl<'a, T: ToSql> ToSql for &'a [T] {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for &'a [u8] {
+impl ToSql for &[u8] {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         types::bytea_to_sql(self, w);
         Ok(IsNull::No)
@@ -1064,7 +1064,7 @@ impl<T: ToSql> ToSql for Box<[T]> {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for Cow<'a, [u8]> {
+impl ToSql for Cow<'_, [u8]> {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         <&[u8] as ToSql>::to_sql(&self.as_ref(), ty, w)
     }
@@ -1088,7 +1088,7 @@ impl ToSql for Vec<u8> {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for &'a str {
+impl ToSql for &str {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         match ty.name() {
             "ltree" => types::ltree_to_sql(self, w),
@@ -1109,7 +1109,7 @@ impl<'a> ToSql for &'a str {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for Cow<'a, str> {
+impl ToSql for Cow<'_, str> {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         <&str as ToSql>::to_sql(&self.as_ref(), ty, w)
     }
@@ -1256,17 +1256,17 @@ impl BorrowToSql for &dyn ToSql {
     }
 }
 
-impl<'a> sealed::Sealed for Box<dyn ToSql + Sync + 'a> {}
+impl sealed::Sealed for Box<dyn ToSql + Sync + '_> {}
 
-impl<'a> BorrowToSql for Box<dyn ToSql + Sync + 'a> {
+impl BorrowToSql for Box<dyn ToSql + Sync + '_> {
     #[inline]
     fn borrow_to_sql(&self) -> &dyn ToSql {
         self.as_ref()
     }
 }
 
-impl<'a> sealed::Sealed for Box<dyn ToSql + Sync + Send + 'a> {}
-impl<'a> BorrowToSql for Box<dyn ToSql + Sync + Send + 'a> {
+impl sealed::Sealed for Box<dyn ToSql + Sync + Send + '_> {}
+impl BorrowToSql for Box<dyn ToSql + Sync + Send + '_> {
     #[inline]
     fn borrow_to_sql(&self) -> &dyn ToSql {
         self.as_ref()
diff --git a/postgres/src/notifications.rs b/postgres/src/notifications.rs
index c31d4f631..0c040dedf 100644
--- a/postgres/src/notifications.rs
+++ b/postgres/src/notifications.rs
@@ -77,7 +77,7 @@ pub struct Iter<'a> {
     connection: ConnectionRef<'a>,
 }
 
-impl<'a> FallibleIterator for Iter<'a> {
+impl FallibleIterator for Iter<'_> {
     type Item = Notification;
     type Error = Error;
 
@@ -100,7 +100,7 @@ pub struct BlockingIter<'a> {
     connection: ConnectionRef<'a>,
 }
 
-impl<'a> FallibleIterator for BlockingIter<'a> {
+impl FallibleIterator for BlockingIter<'_> {
     type Item = Notification;
     type Error = Error;
 
@@ -129,7 +129,7 @@ pub struct TimeoutIter<'a> {
     timeout: Duration,
 }
 
-impl<'a> FallibleIterator for TimeoutIter<'a> {
+impl FallibleIterator for TimeoutIter<'_> {
     type Item = Notification;
     type Error = Error;
 
diff --git a/postgres/src/transaction.rs b/postgres/src/transaction.rs
index 5c8c15973..8126b1dbe 100644
--- a/postgres/src/transaction.rs
+++ b/postgres/src/transaction.rs
@@ -12,7 +12,7 @@ pub struct Transaction<'a> {
     transaction: Option<tokio_postgres::Transaction<'a>>,
 }
 
-impl<'a> Drop for Transaction<'a> {
+impl Drop for Transaction<'_> {
     fn drop(&mut self) {
         if let Some(transaction) = self.transaction.take() {
             let _ = self.connection.block_on(transaction.rollback());
diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index 3ab002871..e269de3a0 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -20,7 +20,7 @@ use std::task::{Context, Poll};
 
 struct BorrowToSqlParamsDebug<'a, T>(&'a [T]);
 
-impl<'a, T> fmt::Debug for BorrowToSqlParamsDebug<'a, T>
+impl<T> fmt::Debug for BorrowToSqlParamsDebug<'_, T>
 where
     T: BorrowToSql,
 {
diff --git a/tokio-postgres/src/row.rs b/tokio-postgres/src/row.rs
index 767c26921..ccb8817d0 100644
--- a/tokio-postgres/src/row.rs
+++ b/tokio-postgres/src/row.rs
@@ -79,9 +79,9 @@ impl RowIndex for str {
     }
 }
 
-impl<'a, T> Sealed for &'a T where T: ?Sized + Sealed {}
+impl<T> Sealed for &T where T: ?Sized + Sealed {}
 
-impl<'a, T> RowIndex for &'a T
+impl<T> RowIndex for &T
 where
     T: ?Sized + RowIndex,
 {
diff --git a/tokio-postgres/src/to_statement.rs b/tokio-postgres/src/to_statement.rs
index 427f77dd7..7e1299272 100644
--- a/tokio-postgres/src/to_statement.rs
+++ b/tokio-postgres/src/to_statement.rs
@@ -11,7 +11,7 @@ mod private {
         Query(&'a str),
     }
 
-    impl<'a> ToStatementType<'a> {
+    impl ToStatementType<'_> {
         pub async fn into_statement(self, client: &Client) -> Result<Statement, Error> {
             match self {
                 ToStatementType::Statement(s) => Ok(s.clone()),
diff --git a/tokio-postgres/src/transaction.rs b/tokio-postgres/src/transaction.rs
index 17a50b60f..782c476c4 100644
--- a/tokio-postgres/src/transaction.rs
+++ b/tokio-postgres/src/transaction.rs
@@ -33,7 +33,7 @@ struct Savepoint {
     depth: u32,
 }
 
-impl<'a> Drop for Transaction<'a> {
+impl Drop for Transaction<'_> {
     fn drop(&mut self) {
         if self.done {
             return;
diff --git a/tokio-postgres/src/transaction_builder.rs b/tokio-postgres/src/transaction_builder.rs
index 93e9e9801..88c883176 100644
--- a/tokio-postgres/src/transaction_builder.rs
+++ b/tokio-postgres/src/transaction_builder.rs
@@ -113,7 +113,7 @@ impl<'a> TransactionBuilder<'a> {
             done: bool,
         }
 
-        impl<'a> Drop for RollbackIfNotDone<'a> {
+        impl Drop for RollbackIfNotDone<'_> {
             fn drop(&mut self) {
                 if self.done {
                     return;

From 7046518af836be42b3ee342eca9177c5b6ec9b97 Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 01:41:11 -0500
Subject: [PATCH 068/106] Fix clippy extra_unused_lifetimes

---
 tokio-postgres/src/query.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index e269de3a0..2fcb22d57 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -61,7 +61,7 @@ where
     })
 }
 
-pub async fn query_typed<'a, P, I>(
+pub async fn query_typed<P, I>(
     client: &Arc<InnerClient>,
     query: &str,
     params: I,

From b13052a970689d465f481be5cf41682b6d03064a Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 01:55:08 -0500
Subject: [PATCH 069/106] Fix for Rust 2024 match ergonomics

Fixes an error related to https://doc.rust-lang.org/nightly/edition-guide/rust-2024/match-ergonomics.html
---
 postgres-types/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index e57f29fbb..d0fcfc440 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -955,7 +955,7 @@ impl<T: ToSql> ToSql for Option<T> {
 
     fn encode_format(&self, ty: &Type) -> Format {
         match self {
-            Some(ref val) => val.encode_format(ty),
+            &Some(ref val) => val.encode_format(ty),
             None => Format::Binary,
         }
     }

From 4d03ed88bf4c73ef2a2e451bc0d8ad28dae43c1a Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 01:58:58 -0500
Subject: [PATCH 070/106] Fix another needless_lifetimes

---
 tokio-postgres/tests/test/types/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index f962bf10a..875164c3b 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -509,7 +509,7 @@ async fn domain() {
         to_sql_checked!();
     }
 
-    impl<'a> FromSql<'a> for SessionId {
+    impl FromSql<'_> for SessionId {
         fn from_sql(ty: &Type, raw: &[u8]) -> result::Result<Self, Box<dyn Error + Sync + Send>> {
             Vec::<u8>::from_sql(ty, raw).map(SessionId)
         }

From 7490e51639310d9d2406d38d6e9b3e31897b96c5 Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 02:00:36 -0500
Subject: [PATCH 071/106] Fix clippy needless_borrowed_reference

The applied suggestion for 2024 match ergonomics trips another lint.
This fixes the lint.
---
 postgres-types/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index d0fcfc440..05b2ac135 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -955,7 +955,7 @@ impl<T: ToSql> ToSql for Option<T> {
 
     fn encode_format(&self, ty: &Type) -> Format {
         match self {
-            &Some(ref val) => val.encode_format(ty),
+            Some(val) => val.encode_format(ty),
             None => Format::Binary,
         }
     }

From 852ae499947cd20a37aeb44e3d73c9eae1611a21 Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 02:06:22 -0500
Subject: [PATCH 072/106] Bump CI Rust version to 1.75.0

cargo tests in CI are [failing](https://github.com/sfackler/rust-postgres/actions/runs/12862700447/job/35858038081?pr=1198)
because of a dependency requirement:

```
Run cargo test --all
error: package `geo-types v0.7.15` cannot be built because it requires rustc 1.75 or newer, while the currently active rustc version is 1.74.0
Either upgrade to rustc 1.75 or newer, or use
cargo update geo-types@0.7.15 --precise ver
where `ver` is the latest version of `geo-types` supporting rustc 1.74.0
```

This bumps the Rust version so tests will run.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 641a42722..81c3db8b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
       - run: docker compose up -d
       - uses: sfackler/actions/rustup@master
         with:
-          version: 1.74.0
+          version: 1.75.0
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
       - uses: actions/cache@v3

From 66622f3dfbfcefc999c1e0892dd857581a93faa0 Mon Sep 17 00:00:00 2001
From: Allan <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 02:09:36 -0500
Subject: [PATCH 073/106] Bump actions/checkout

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81c3db8b8..c14751e94 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
     name: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: docker compose up -d
       - uses: sfackler/actions/rustup@master
         with:

From 0a25fd191010925cfec38f29086e51a567d3aa79 Mon Sep 17 00:00:00 2001
From: Allan Zhang <6740989+allan2@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:21:23 -0500
Subject: [PATCH 074/106] Empty commit (re-run CI)


From e00ceb168fc9aeee5a28dd17527e89b3a2d312d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 13:32:09 +0000
Subject: [PATCH 075/106] Update rand requirement from 0.8 to 0.9

Updates the requirements on [rand](https://github.com/rust-random/rand) to permit the latest version.
- [Release notes](https://github.com/rust-random/rand/releases)
- [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-random/rand/compare/0.8.5...0.9.0)

---
updated-dependencies:
- dependency-name: rand
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 postgres-protocol/Cargo.toml | 2 +-
 tokio-postgres/Cargo.toml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/postgres-protocol/Cargo.toml b/postgres-protocol/Cargo.toml
index 49cf2d59c..7525532d6 100644
--- a/postgres-protocol/Cargo.toml
+++ b/postgres-protocol/Cargo.toml
@@ -20,7 +20,7 @@ fallible-iterator = "0.2"
 hmac = "0.12"
 md-5 = "0.10"
 memchr = "2.0"
-rand = "0.8"
+rand = "0.9"
 sha2 = "0.10"
 stringprep = "0.1"
 getrandom = { version = "0.2", optional = true }
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index ee6fefb81..3fea01ff0 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -59,7 +59,7 @@ postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
 postgres-types = { version = "0.2.8", path = "../postgres-types" }
 tokio = { version = "1.27", features = ["io-util"] }
 tokio-util = { version = "0.7", features = ["codec"] }
-rand = "0.8.5"
+rand = "0.9.0"
 whoami = "1.4.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

From 96f23479caa7ff6c1f1daf66863593cc94765164 Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Thu, 30 Jan 2025 18:10:18 +0800
Subject: [PATCH 076/106] refactor: address review comments

---
 tokio-postgres/src/config.rs      | 18 ++++++++++++++----
 tokio-postgres/src/connect_tls.rs |  3 +++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/tokio-postgres/src/config.rs b/tokio-postgres/src/config.rs
index fb673b9b9..20190f4e4 100644
--- a/tokio-postgres/src/config.rs
+++ b/tokio-postgres/src/config.rs
@@ -51,10 +51,14 @@ pub enum SslMode {
 }
 
 /// TLS negotiation configuration
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+///
+/// See more information at
+/// https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLNEGOTIATION
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 #[non_exhaustive]
 pub enum SslNegotiation {
     /// Use PostgreSQL SslRequest for Ssl negotiation
+    #[default]
     Postgres,
     /// Start Ssl handshake without negotiation, only works for PostgreSQL 17+
     Direct,
@@ -116,9 +120,15 @@ pub enum Host {
 ///     path to the directory containing Unix domain sockets. Otherwise, it is treated as a hostname. Multiple hosts
 ///     can be specified, separated by commas. Each host will be tried in turn when connecting. Required if connecting
 ///     with the `connect` method.
-/// * `sslnegotiation` - TLS negotiation method. If set to `direct`, the client will perform direct TLS handshake, this only works for PostgreSQL 17 and newer.
-///     Note that you will need to setup ALPN of TLS client configuration to `postgresql` when using direct TLS.
-///     If set to `postgres`, the default value, it follows original postgres wire protocol to perform the negotiation.
+/// * `sslnegotiation` - TLS negotiation method. If set to `direct`, the client
+///     will perform direct TLS handshake, this only works for PostgreSQL 17 and
+///     newer.
+///     Note that you will need to setup ALPN of TLS client configuration to
+///     `postgresql` when using direct TLS. If you are using postgres_openssl
+///     as TLS backend, a `postgres_openssl::set_postgresql_alpn` helper is
+///     provided for that.
+///     If set to `postgres`, the default value, it follows original postgres
+///     wire protocol to perform the negotiation.
 /// * `hostaddr` - Numeric IP address of host to connect to. This should be in the standard IPv4 address format,
 ///     e.g., 172.28.40.9. If your machine supports IPv6, you can also use those addresses.
 ///     If this parameter is not specified, the value of `host` will be looked up to find the corresponding IP address,
diff --git a/tokio-postgres/src/connect_tls.rs b/tokio-postgres/src/connect_tls.rs
index c7a093064..d220cd3b5 100644
--- a/tokio-postgres/src/connect_tls.rs
+++ b/tokio-postgres/src/connect_tls.rs
@@ -23,6 +23,9 @@ where
         SslMode::Prefer if !tls.can_connect(ForcePrivateApi) => {
             return Ok(MaybeTlsStream::Raw(stream))
         }
+        SslMode::Prefer if negotiation == SslNegotiation::Direct => {
+            return Err(Error::tls("weak sslmode \"prefer\" may not be used with sslnegotiation=direct (use \"require\", \"verify-ca\", or \"verify-full\")".into()))
+        }
         SslMode::Prefer | SslMode::Require => {}
     }
 

From 02463b12c124ecb3a7780b72005c368a5166e166 Mon Sep 17 00:00:00 2001
From: Kristof Mattei <864376+Kristof-Mattei@users.noreply.github.com>
Date: Fri, 31 Jan 2025 23:02:01 -0700
Subject: [PATCH 077/106] chore: addressed rand 0.9's deprecations

---
 postgres-protocol/src/authentication/sasl.rs | 4 ++--
 postgres-protocol/src/password/mod.rs        | 2 +-
 tokio-postgres/src/connect.rs                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/postgres-protocol/src/authentication/sasl.rs b/postgres-protocol/src/authentication/sasl.rs
index 4a77507e9..ccd40e8d0 100644
--- a/postgres-protocol/src/authentication/sasl.rs
+++ b/postgres-protocol/src/authentication/sasl.rs
@@ -136,10 +136,10 @@ impl ScramSha256 {
     /// Constructs a new instance which will use the provided password for authentication.
     pub fn new(password: &[u8], channel_binding: ChannelBinding) -> ScramSha256 {
         // rand 0.5's ThreadRng is cryptographically secure
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         let nonce = (0..NONCE_LENGTH)
             .map(|_| {
-                let mut v = rng.gen_range(0x21u8..0x7e);
+                let mut v = rng.random_range(0x21u8..0x7e);
                 if v == 0x2c {
                     v = 0x7e
                 }
diff --git a/postgres-protocol/src/password/mod.rs b/postgres-protocol/src/password/mod.rs
index f03bb811d..445fb0c0e 100644
--- a/postgres-protocol/src/password/mod.rs
+++ b/postgres-protocol/src/password/mod.rs
@@ -28,7 +28,7 @@ const SCRAM_DEFAULT_SALT_LEN: usize = 16;
 /// special characters that would require escaping in an SQL command.
 pub fn scram_sha_256(password: &[u8]) -> String {
     let mut salt: [u8; SCRAM_DEFAULT_SALT_LEN] = [0; SCRAM_DEFAULT_SALT_LEN];
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     rng.fill_bytes(&mut salt);
     scram_sha_256_salt(password, salt)
 }
diff --git a/tokio-postgres/src/connect.rs b/tokio-postgres/src/connect.rs
index 8189cb91c..e97a7a2a3 100644
--- a/tokio-postgres/src/connect.rs
+++ b/tokio-postgres/src/connect.rs
@@ -44,7 +44,7 @@ where
 
     let mut indices = (0..num_hosts).collect::<Vec<_>>();
     if config.load_balance_hosts == LoadBalanceHosts::Random {
-        indices.shuffle(&mut rand::thread_rng());
+        indices.shuffle(&mut rand::rng());
     }
 
     let mut error = None;
@@ -101,7 +101,7 @@ where
                 .collect::<Vec<_>>();
 
             if config.load_balance_hosts == LoadBalanceHosts::Random {
-                addrs.shuffle(&mut rand::thread_rng());
+                addrs.shuffle(&mut rand::rng());
             }
 
             let mut last_err = None;

From 14a1216e7b7db45217182edb7019929269a9de3c Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:00:05 -0500
Subject: [PATCH 078/106] fix build

---
 postgres-native-tls/src/test.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/postgres-native-tls/src/test.rs b/postgres-native-tls/src/test.rs
index b34fa7351..738c04bd7 100644
--- a/postgres-native-tls/src/test.rs
+++ b/postgres-native-tls/src/test.rs
@@ -44,11 +44,12 @@ async fn require() {
 
 #[tokio::test]
 async fn direct() {
-    let connector = set_postgresql_alpn(native_tls::TlsConnector::builder().add_root_certificate(
+    let mut builder = native_tls::TlsConnector::builder();
+    builder.add_root_certificate(
         Certificate::from_pem(include_bytes!("../../test/server.crt")).unwrap(),
-    ))
-    .build()
-    .unwrap();
+    );
+    set_postgresql_alpn(&mut builder);
+    let connector = builder.build().unwrap();
     smoke_test(
         "user=ssl_user dbname=postgres sslmode=require sslnegotiation=direct",
         TlsConnector::new(connector, "localhost"),

From 720ffe83216714bf9716a03122c547a2e8e9bfd9 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:03:12 -0500
Subject: [PATCH 079/106] fix clippy

---
 postgres-protocol/src/message/backend.rs  |  8 ++++----
 postgres-protocol/src/types/mod.rs        |  4 ++--
 postgres-types/src/lib.rs                 | 20 ++++++++++----------
 postgres/src/notifications.rs             |  6 +++---
 postgres/src/transaction.rs               |  2 +-
 tokio-postgres/src/generic_client.rs      |  4 ++--
 tokio-postgres/src/query.rs               |  4 ++--
 tokio-postgres/src/row.rs                 |  4 ++--
 tokio-postgres/src/to_statement.rs        |  2 +-
 tokio-postgres/src/transaction.rs         |  2 +-
 tokio-postgres/src/transaction_builder.rs |  2 +-
 tokio-postgres/tests/test/types/mod.rs    |  2 +-
 12 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/postgres-protocol/src/message/backend.rs b/postgres-protocol/src/message/backend.rs
index 73b169288..013bfbb81 100644
--- a/postgres-protocol/src/message/backend.rs
+++ b/postgres-protocol/src/message/backend.rs
@@ -475,7 +475,7 @@ pub struct ColumnFormats<'a> {
     remaining: u16,
 }
 
-impl<'a> FallibleIterator for ColumnFormats<'a> {
+impl FallibleIterator for ColumnFormats<'_> {
     type Item = u16;
     type Error = io::Error;
 
@@ -557,7 +557,7 @@ pub struct DataRowRanges<'a> {
     remaining: u16,
 }
 
-impl<'a> FallibleIterator for DataRowRanges<'a> {
+impl FallibleIterator for DataRowRanges<'_> {
     type Item = Option<Range<usize>>;
     type Error = io::Error;
 
@@ -645,7 +645,7 @@ pub struct ErrorField<'a> {
     value: &'a [u8],
 }
 
-impl<'a> ErrorField<'a> {
+impl ErrorField<'_> {
     #[inline]
     pub fn type_(&self) -> u8 {
         self.type_
@@ -717,7 +717,7 @@ pub struct Parameters<'a> {
     remaining: u16,
 }
 
-impl<'a> FallibleIterator for Parameters<'a> {
+impl FallibleIterator for Parameters<'_> {
     type Item = Oid;
     type Error = io::Error;
 
diff --git a/postgres-protocol/src/types/mod.rs b/postgres-protocol/src/types/mod.rs
index 05f515f76..37dc793b1 100644
--- a/postgres-protocol/src/types/mod.rs
+++ b/postgres-protocol/src/types/mod.rs
@@ -582,7 +582,7 @@ impl<'a> Array<'a> {
 /// An iterator over the dimensions of an array.
 pub struct ArrayDimensions<'a>(&'a [u8]);
 
-impl<'a> FallibleIterator for ArrayDimensions<'a> {
+impl FallibleIterator for ArrayDimensions<'_> {
     type Item = ArrayDimension;
     type Error = StdBox<dyn Error + Sync + Send>;
 
@@ -950,7 +950,7 @@ pub struct PathPoints<'a> {
     buf: &'a [u8],
 }
 
-impl<'a> FallibleIterator for PathPoints<'a> {
+impl FallibleIterator for PathPoints<'_> {
     type Item = Point;
     type Error = StdBox<dyn Error + Sync + Send>;
 
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 6ad2eff50..e57f29fbb 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -914,7 +914,7 @@ pub enum Format {
     Binary,
 }
 
-impl<'a, T> ToSql for &'a T
+impl<T> ToSql for &T
 where
     T: ToSql,
 {
@@ -963,7 +963,7 @@ impl<T: ToSql> ToSql for Option<T> {
     to_sql_checked!();
 }
 
-impl<'a, T: ToSql> ToSql for &'a [T] {
+impl<T: ToSql> ToSql for &[T] {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         let member_type = match *ty.kind() {
             Kind::Array(ref member) => member,
@@ -1004,7 +1004,7 @@ impl<'a, T: ToSql> ToSql for &'a [T] {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for &'a [u8] {
+impl ToSql for &[u8] {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         types::bytea_to_sql(self, w);
         Ok(IsNull::No)
@@ -1064,7 +1064,7 @@ impl<T: ToSql> ToSql for Box<[T]> {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for Cow<'a, [u8]> {
+impl ToSql for Cow<'_, [u8]> {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         <&[u8] as ToSql>::to_sql(&self.as_ref(), ty, w)
     }
@@ -1088,7 +1088,7 @@ impl ToSql for Vec<u8> {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for &'a str {
+impl ToSql for &str {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         match ty.name() {
             "ltree" => types::ltree_to_sql(self, w),
@@ -1109,7 +1109,7 @@ impl<'a> ToSql for &'a str {
     to_sql_checked!();
 }
 
-impl<'a> ToSql for Cow<'a, str> {
+impl ToSql for Cow<'_, str> {
     fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         <&str as ToSql>::to_sql(&self.as_ref(), ty, w)
     }
@@ -1256,17 +1256,17 @@ impl BorrowToSql for &dyn ToSql {
     }
 }
 
-impl<'a> sealed::Sealed for Box<dyn ToSql + Sync + 'a> {}
+impl sealed::Sealed for Box<dyn ToSql + Sync + '_> {}
 
-impl<'a> BorrowToSql for Box<dyn ToSql + Sync + 'a> {
+impl BorrowToSql for Box<dyn ToSql + Sync + '_> {
     #[inline]
     fn borrow_to_sql(&self) -> &dyn ToSql {
         self.as_ref()
     }
 }
 
-impl<'a> sealed::Sealed for Box<dyn ToSql + Sync + Send + 'a> {}
-impl<'a> BorrowToSql for Box<dyn ToSql + Sync + Send + 'a> {
+impl sealed::Sealed for Box<dyn ToSql + Sync + Send + '_> {}
+impl BorrowToSql for Box<dyn ToSql + Sync + Send + '_> {
     #[inline]
     fn borrow_to_sql(&self) -> &dyn ToSql {
         self.as_ref()
diff --git a/postgres/src/notifications.rs b/postgres/src/notifications.rs
index c31d4f631..0c040dedf 100644
--- a/postgres/src/notifications.rs
+++ b/postgres/src/notifications.rs
@@ -77,7 +77,7 @@ pub struct Iter<'a> {
     connection: ConnectionRef<'a>,
 }
 
-impl<'a> FallibleIterator for Iter<'a> {
+impl FallibleIterator for Iter<'_> {
     type Item = Notification;
     type Error = Error;
 
@@ -100,7 +100,7 @@ pub struct BlockingIter<'a> {
     connection: ConnectionRef<'a>,
 }
 
-impl<'a> FallibleIterator for BlockingIter<'a> {
+impl FallibleIterator for BlockingIter<'_> {
     type Item = Notification;
     type Error = Error;
 
@@ -129,7 +129,7 @@ pub struct TimeoutIter<'a> {
     timeout: Duration,
 }
 
-impl<'a> FallibleIterator for TimeoutIter<'a> {
+impl FallibleIterator for TimeoutIter<'_> {
     type Item = Notification;
     type Error = Error;
 
diff --git a/postgres/src/transaction.rs b/postgres/src/transaction.rs
index 5c8c15973..8126b1dbe 100644
--- a/postgres/src/transaction.rs
+++ b/postgres/src/transaction.rs
@@ -12,7 +12,7 @@ pub struct Transaction<'a> {
     transaction: Option<tokio_postgres::Transaction<'a>>,
 }
 
-impl<'a> Drop for Transaction<'a> {
+impl Drop for Transaction<'_> {
     fn drop(&mut self) {
         if let Some(transaction) = self.transaction.take() {
             let _ = self.connection.block_on(transaction.rollback());
diff --git a/tokio-postgres/src/generic_client.rs b/tokio-postgres/src/generic_client.rs
index 6e7dffeb1..dcda147b5 100644
--- a/tokio-postgres/src/generic_client.rs
+++ b/tokio-postgres/src/generic_client.rs
@@ -80,7 +80,7 @@ pub trait GenericClient: private::Sealed {
     ) -> Result<Statement, Error>;
 
     /// Like [`Client::transaction`].
-    async fn transaction(&mut self) -> Result<Transaction<'_>, Error>;
+    async fn transaction<'a>(&'a mut self) -> Result<Transaction<'a>, Error>;
 
     /// Like [`Client::batch_execute`].
     async fn batch_execute(&self, query: &str) -> Result<(), Error>;
@@ -180,7 +180,7 @@ impl GenericClient for Client {
         self.prepare_typed(query, parameter_types).await
     }
 
-    async fn transaction(&mut self) -> Result<Transaction<'_>, Error> {
+    async fn transaction<'a>(&'a mut self) -> Result<Transaction<'a>, Error> {
         self.transaction().await
     }
 
diff --git a/tokio-postgres/src/query.rs b/tokio-postgres/src/query.rs
index 3ab002871..2fcb22d57 100644
--- a/tokio-postgres/src/query.rs
+++ b/tokio-postgres/src/query.rs
@@ -20,7 +20,7 @@ use std::task::{Context, Poll};
 
 struct BorrowToSqlParamsDebug<'a, T>(&'a [T]);
 
-impl<'a, T> fmt::Debug for BorrowToSqlParamsDebug<'a, T>
+impl<T> fmt::Debug for BorrowToSqlParamsDebug<'_, T>
 where
     T: BorrowToSql,
 {
@@ -61,7 +61,7 @@ where
     })
 }
 
-pub async fn query_typed<'a, P, I>(
+pub async fn query_typed<P, I>(
     client: &Arc<InnerClient>,
     query: &str,
     params: I,
diff --git a/tokio-postgres/src/row.rs b/tokio-postgres/src/row.rs
index 767c26921..ccb8817d0 100644
--- a/tokio-postgres/src/row.rs
+++ b/tokio-postgres/src/row.rs
@@ -79,9 +79,9 @@ impl RowIndex for str {
     }
 }
 
-impl<'a, T> Sealed for &'a T where T: ?Sized + Sealed {}
+impl<T> Sealed for &T where T: ?Sized + Sealed {}
 
-impl<'a, T> RowIndex for &'a T
+impl<T> RowIndex for &T
 where
     T: ?Sized + RowIndex,
 {
diff --git a/tokio-postgres/src/to_statement.rs b/tokio-postgres/src/to_statement.rs
index 427f77dd7..7e1299272 100644
--- a/tokio-postgres/src/to_statement.rs
+++ b/tokio-postgres/src/to_statement.rs
@@ -11,7 +11,7 @@ mod private {
         Query(&'a str),
     }
 
-    impl<'a> ToStatementType<'a> {
+    impl ToStatementType<'_> {
         pub async fn into_statement(self, client: &Client) -> Result<Statement, Error> {
             match self {
                 ToStatementType::Statement(s) => Ok(s.clone()),
diff --git a/tokio-postgres/src/transaction.rs b/tokio-postgres/src/transaction.rs
index 17a50b60f..782c476c4 100644
--- a/tokio-postgres/src/transaction.rs
+++ b/tokio-postgres/src/transaction.rs
@@ -33,7 +33,7 @@ struct Savepoint {
     depth: u32,
 }
 
-impl<'a> Drop for Transaction<'a> {
+impl Drop for Transaction<'_> {
     fn drop(&mut self) {
         if self.done {
             return;
diff --git a/tokio-postgres/src/transaction_builder.rs b/tokio-postgres/src/transaction_builder.rs
index 93e9e9801..88c883176 100644
--- a/tokio-postgres/src/transaction_builder.rs
+++ b/tokio-postgres/src/transaction_builder.rs
@@ -113,7 +113,7 @@ impl<'a> TransactionBuilder<'a> {
             done: bool,
         }
 
-        impl<'a> Drop for RollbackIfNotDone<'a> {
+        impl Drop for RollbackIfNotDone<'_> {
             fn drop(&mut self) {
                 if self.done {
                     return;
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index f962bf10a..875164c3b 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -509,7 +509,7 @@ async fn domain() {
         to_sql_checked!();
     }
 
-    impl<'a> FromSql<'a> for SessionId {
+    impl FromSql<'_> for SessionId {
         fn from_sql(ty: &Type, raw: &[u8]) -> result::Result<Self, Box<dyn Error + Sync + Send>> {
             Vec::<u8>::from_sql(ty, raw).map(SessionId)
         }

From acd17edf612e99249530760573901e2a1875ccd1 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:20:41 -0500
Subject: [PATCH 080/106] fix wasm build

---
 .github/workflows/ci.yml     | 2 ++
 postgres-protocol/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c14751e94..10181f09b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,6 +73,8 @@ jobs:
           path: target
           key: check-wasm32-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
       - run: cargo check --target wasm32-unknown-unknown --manifest-path tokio-postgres/Cargo.toml --no-default-features --features js
+        env:
+          RUSTFLAGS: --cfg getrandom_backend="wasm_js"
 
   test:
     name: test
diff --git a/postgres-protocol/Cargo.toml b/postgres-protocol/Cargo.toml
index 7525532d6..efb283d6e 100644
--- a/postgres-protocol/Cargo.toml
+++ b/postgres-protocol/Cargo.toml
@@ -10,7 +10,7 @@ readme = "../README.md"
 
 [features]
 default = []
-js = ["getrandom/js"]
+js = ["getrandom/wasm_js"]
 
 [dependencies]
 base64 = "0.22"

From 0d18b95f4e0f03681345fdfa68fd6213e1e4d7eb Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:23:13 -0500
Subject: [PATCH 081/106] bump getrandom

---
 postgres-protocol/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres-protocol/Cargo.toml b/postgres-protocol/Cargo.toml
index efb283d6e..f7a34b2d8 100644
--- a/postgres-protocol/Cargo.toml
+++ b/postgres-protocol/Cargo.toml
@@ -23,4 +23,4 @@ memchr = "2.0"
 rand = "0.9"
 sha2 = "0.10"
 stringprep = "0.1"
-getrandom = { version = "0.2", optional = true }
+getrandom = { version = "0.3", optional = true }

From 9754f1310999077cd1f54b66d7f660c69a15c403 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:34:29 -0500
Subject: [PATCH 082/106] Revert time 0.2 change

---
 postgres-types/src/time_02.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/postgres-types/src/time_02.rs b/postgres-types/src/time_02.rs
index 1f2ba1ce1..19a8909e7 100644
--- a/postgres-types/src/time_02.rs
+++ b/postgres-types/src/time_02.rs
@@ -14,9 +14,7 @@ const fn base() -> PrimitiveDateTime {
 impl<'a> FromSql<'a> for PrimitiveDateTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<PrimitiveDateTime, Box<dyn Error + Sync + Send>> {
         let t = types::timestamp_from_sql(raw)?;
-        Ok(base()
-            .checked_add(Duration::microseconds(t))
-            .ok_or("value too large to decode")?)
+        Ok(base() + Duration::microseconds(t))
     }
 
     accepts!(TIMESTAMP);

From 89b91b4ca0b18fdb22e74a746a315827815e3cff Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:41:17 -0500
Subject: [PATCH 083/106] Propagate features

---
 postgres/Cargo.toml       | 2 ++
 tokio-postgres/Cargo.toml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index 9e360c2a4..db74d8af4 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -24,6 +24,8 @@ circle-ci = { repository = "sfackler/rust-postgres" }
 array-impls = ["tokio-postgres/array-impls"]
 with-bit-vec-0_6 = ["tokio-postgres/with-bit-vec-0_6"]
 with-chrono-0_4 = ["tokio-postgres/with-chrono-0_4"]
+with-cidr-0_2 = ["tokio-postgres/with-cidr-0_2"]
+with-cidr-0_3 = ["tokio-postgres/with-cidr-0_3"]
 with-eui48-0_4 = ["tokio-postgres/with-eui48-0_4"]
 with-eui48-1 = ["tokio-postgres/with-eui48-1"]
 with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index 3fea01ff0..4e143ee27 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -30,6 +30,8 @@ runtime = ["tokio/net", "tokio/time"]
 array-impls = ["postgres-types/array-impls"]
 with-bit-vec-0_6 = ["postgres-types/with-bit-vec-0_6"]
 with-chrono-0_4 = ["postgres-types/with-chrono-0_4"]
+with-cidr-0_2 = ["postgres-types/with-cidr-0_2"]
+with-cidr-0_3 = ["postgres-types/with-cidr-0_3"]
 with-eui48-0_4 = ["postgres-types/with-eui48-0_4"]
 with-eui48-1 = ["postgres-types/with-eui48-1"]
 with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]

From bfb35b24c6dc43c3ae00bb5ecb1a6cfa59d8d896 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:42:53 -0500
Subject: [PATCH 084/106] add docs

---
 postgres-types/src/lib.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index a31077ea0..db044bcbd 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -491,6 +491,8 @@ impl WrongType {
 /// | `chrono::DateTime<FixedOffset>` | TIMESTAMP WITH TIME ZONE            |
 /// | `chrono::NaiveDate`             | DATE                                |
 /// | `chrono::NaiveTime`             | TIME                                |
+/// | `cidr::IpCidr`                  | CIDR                                |
+/// | `cidr::IpInet`                  | INET                                |
 /// | `time::PrimitiveDateTime`       | TIMESTAMP                           |
 /// | `time::OffsetDateTime`          | TIMESTAMP WITH TIME ZONE            |
 /// | `time::Date`                    | DATE                                |
@@ -842,6 +844,8 @@ pub enum IsNull {
 /// | `chrono::DateTime<FixedOffset>` | TIMESTAMP WITH TIME ZONE            |
 /// | `chrono::NaiveDate`             | DATE                                |
 /// | `chrono::NaiveTime`             | TIME                                |
+/// | `cidr::IpCidr`                  | CIDR                                |
+/// | `cidr::IpInet`                  | INET                                |
 /// | `time::PrimitiveDateTime`       | TIMESTAMP                           |
 /// | `time::OffsetDateTime`          | TIMESTAMP WITH TIME ZONE            |
 /// | `time::Date`                    | DATE                                |

From a5eaea14474d6a0d40881870abd3c044d58a6d50 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:46:21 -0500
Subject: [PATCH 085/106] fix ci

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10181f09b..3426d624b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
       - run: docker compose up -d
       - uses: sfackler/actions/rustup@master
         with:
-          version: 1.75.0
+          version: 1.81.0
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
       - uses: actions/cache@v3

From 14f3b9e2b74987df99605a77a4c91d1de54b211d Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:56:49 -0500
Subject: [PATCH 086/106] Release postgres-native-tls v0.5.1

---
 postgres-native-tls/CHANGELOG.md | 6 ++++++
 postgres-native-tls/Cargo.toml   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/postgres-native-tls/CHANGELOG.md b/postgres-native-tls/CHANGELOG.md
index 9eb7ab800..5fe0a9c7a 100644
--- a/postgres-native-tls/CHANGELOG.md
+++ b/postgres-native-tls/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.5.1 - 2025-02-02
+
+### Added
+
+* Added `set_postgresql_alpn`.
+
 ## v0.5.0 - 2020-12-25
 
 ### Changed
diff --git a/postgres-native-tls/Cargo.toml b/postgres-native-tls/Cargo.toml
index e86c7ce2d..f79ae5491 100644
--- a/postgres-native-tls/Cargo.toml
+++ b/postgres-native-tls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-native-tls"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From 1ed6365d5c416e410c87388ca5228bbaf0f262fa Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 15:58:25 -0500
Subject: [PATCH 087/106] Release postgres-openssl v0.5.1

---
 postgres-openssl/CHANGELOG.md | 6 ++++++
 postgres-openssl/Cargo.toml   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/postgres-openssl/CHANGELOG.md b/postgres-openssl/CHANGELOG.md
index 346214ae8..33f5a127a 100644
--- a/postgres-openssl/CHANGELOG.md
+++ b/postgres-openssl/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.5.1 - 2025-02-02
+
+### Added
+
+* Added `set_postgresql_alpn`.
+
 ## v0.5.0 - 2020-12-25
 
 ### Changed
diff --git a/postgres-openssl/Cargo.toml b/postgres-openssl/Cargo.toml
index 9013384a2..6ebb86bef 100644
--- a/postgres-openssl/Cargo.toml
+++ b/postgres-openssl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-openssl"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From 966724c37784014a0e1f9d463c5c245102c75b33 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 16:01:02 -0500
Subject: [PATCH 088/106] Release postgres-protocol v0.6.8

---
 postgres-protocol/CHANGELOG.md | 6 ++++++
 postgres-protocol/Cargo.toml   | 2 +-
 postgres-types/Cargo.toml      | 2 +-
 tokio-postgres/Cargo.toml      | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/postgres-protocol/CHANGELOG.md b/postgres-protocol/CHANGELOG.md
index 54dce91b0..25e717128 100644
--- a/postgres-protocol/CHANGELOG.md
+++ b/postgres-protocol/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.6.8 - 2025-02-02
+
+### Changed
+
+* Upgraded `getrandom`.
+
 ## v0.6.7 - 2024-07-21
 
 ### Deprecated
diff --git a/postgres-protocol/Cargo.toml b/postgres-protocol/Cargo.toml
index f7a34b2d8..9351ea14f 100644
--- a/postgres-protocol/Cargo.toml
+++ b/postgres-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-protocol"
-version = "0.6.7"
+version = "0.6.8"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 description = "Low level Postgres protocol APIs"
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index d417664ea..2d2408ddf 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -33,7 +33,7 @@ with-time-0_3 = ["time-03"]
 [dependencies]
 bytes = "1.0"
 fallible-iterator = "0.2"
-postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
+postgres-protocol = { version = "0.6.8", path = "../postgres-protocol" }
 postgres-derive = { version = "0.4.6", optional = true, path = "../postgres-derive" }
 
 array-init = { version = "2", optional = true }
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index 4e143ee27..71c36a9e7 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -57,7 +57,7 @@ parking_lot = "0.12"
 percent-encoding = "2.0"
 pin-project-lite = "0.2"
 phf = "0.11"
-postgres-protocol = { version = "0.6.7", path = "../postgres-protocol" }
+postgres-protocol = { version = "0.6.8", path = "../postgres-protocol" }
 postgres-types = { version = "0.2.8", path = "../postgres-types" }
 tokio = { version = "1.27", features = ["io-util"] }
 tokio-util = { version = "0.7", features = ["codec"] }

From 43c7049ce6feab933c1f89347369ab9d177e7b99 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 16:04:41 -0500
Subject: [PATCH 089/106] Release postgres-types v0.2.9

---
 postgres-types/CHANGELOG.md | 10 ++++++++++
 postgres-types/Cargo.toml   |  2 +-
 tokio-postgres/Cargo.toml   |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/postgres-types/CHANGELOG.md b/postgres-types/CHANGELOG.md
index 777f999a7..7fa6d6506 100644
--- a/postgres-types/CHANGELOG.md
+++ b/postgres-types/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## v0.2.9 - 2025-02-02
+
+### Added
+
+* Added support for `cidr` 0.3 via the `with-cidr-0_3` feature.
+
+### Fixed
+
+* Fixed deserialization of out of bounds inputs to `time` 0.3 types to return an error rather than panic.
+
 ## v0.2.8 - 2024-09-15
 
 ### Added
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index 2d2408ddf..8d56f99ec 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres-types"
-version = "0.2.8"
+version = "0.2.9"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index 71c36a9e7..a297d4f66 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -58,7 +58,7 @@ percent-encoding = "2.0"
 pin-project-lite = "0.2"
 phf = "0.11"
 postgres-protocol = { version = "0.6.8", path = "../postgres-protocol" }
-postgres-types = { version = "0.2.8", path = "../postgres-types" }
+postgres-types = { version = "0.2.9", path = "../postgres-types" }
 tokio = { version = "1.27", features = ["io-util"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 rand = "0.9.0"

From ad68abfd48b39a433bb4127bf1ae140b9be64d9e Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 16:08:13 -0500
Subject: [PATCH 090/106] Release tokio-postgres v0.7.13

---
 postgres/Cargo.toml         |  2 +-
 tokio-postgres/CHANGELOG.md | 15 +++++++++++++++
 tokio-postgres/Cargo.toml   |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index db74d8af4..cd7b164b1 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -43,7 +43,7 @@ bytes = "1.0"
 fallible-iterator = "0.2"
 futures-util = { version = "0.3.14", features = ["sink"] }
 log = "0.4"
-tokio-postgres = { version = "0.7.12", path = "../tokio-postgres" }
+tokio-postgres = { version = "0.7.13", path = "../tokio-postgres" }
 tokio = { version = "1.0", features = ["rt", "time"] }
 
 [dev-dependencies]
diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index 9ee470db6..a67f69ea7 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## v0.7.13 - 2025-02-02
+
+### Added
+
+* Added support for direct TLS negotiation.
+* Added support for `cidr` 0.3 via the `with-cidr-0_3` feature.
+
+### Fixes
+
+* Added `load_balance_hosts` to `Config`'s `Debug` implementation.
+
+### Changes
+
+* Upgraded `rand`.
+
 ## v0.7.12 - 2024-09-15
 
 ### Fixed
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index a297d4f66..e9cc5fcfc 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokio-postgres"
-version = "0.7.12"
+version = "0.7.13"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From bfe5b9dd75b7b52e9c89ff8ee8eb172cdf860b5c Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 2 Feb 2025 16:10:02 -0500
Subject: [PATCH 091/106] Release postgres v0.19.10

---
 postgres/CHANGELOG.md | 7 +++++++
 postgres/Cargo.toml   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
index c3e686714..41222c927 100644
--- a/postgres/CHANGELOG.md
+++ b/postgres/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## v0.19.01 - 2025-02-02
+
+### Added
+
+* Added support for direct TLS negotiation.
+* Added support for `cidr` 0.3 via the `with-cidr-0_3` feature.
+
 ## v0.19.9 - 2024-09-15
 
 ### Added
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index cd7b164b1..c5d055c31 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "postgres"
-version = "0.19.9"
+version = "0.19.10"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From 5c56e5e512eac195ab074d66f978957444e13860 Mon Sep 17 00:00:00 2001
From: Charmander <~@charmander.me>
Date: Mon, 3 Feb 2025 00:15:54 +0000
Subject: [PATCH 092/106] =?UTF-8?q?Fix=20typo=20in=20version=20in=20postgr?=
 =?UTF-8?q?es=E2=80=99s=20changelog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 postgres/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
index 41222c927..771e2e779 100644
--- a/postgres/CHANGELOG.md
+++ b/postgres/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-## v0.19.01 - 2025-02-02
+## v0.19.10 - 2025-02-02
 
 ### Added
 

From c867352975c4d27d3db0ebc706a79c7407ead1cd Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 11 Feb 2025 20:32:34 -0500
Subject: [PATCH 093/106] Only call set_tcp_user_timeout when enabled

---
 tokio-postgres/src/connect_socket.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tokio-postgres/src/connect_socket.rs b/tokio-postgres/src/connect_socket.rs
index f27131178..26184701f 100644
--- a/tokio-postgres/src/connect_socket.rs
+++ b/tokio-postgres/src/connect_socket.rs
@@ -27,10 +27,11 @@ pub(crate) async fn connect_socket(
             stream.set_nodelay(true).map_err(Error::connect)?;
 
             let sock_ref = SockRef::from(&stream);
+
             #[cfg(target_os = "linux")]
-            {
+            if let Some(tcp_user_timeout) = tcp_user_timeout {
                 sock_ref
-                    .set_tcp_user_timeout(tcp_user_timeout)
+                    .set_tcp_user_timeout(Some(tcp_user_timeout))
                     .map_err(Error::connect)?;
             }
 

From cd8a34199c65f3e28c9466f1ab59949ce5d15509 Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Wed, 12 Feb 2025 15:44:33 -0500
Subject: [PATCH 094/106] feat: support jiff v0.2

---
 postgres-types/Cargo.toml     |   2 +
 postgres-types/src/jiff_02.rs | 141 ++++++++++++++++++++++++++++++++++
 postgres-types/src/lib.rs     |   2 +
 3 files changed, 145 insertions(+)
 create mode 100644 postgres-types/src/jiff_02.rs

diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index 8d56f99ec..d6527f3b9 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -23,6 +23,7 @@ with-eui48-1 = ["eui48-1"]
 with-geo-types-0_6 = ["geo-types-06"]
 with-geo-types-0_7 = ["geo-types-0_7"]
 with-jiff-0_1 = ["jiff-01"]
+with-jiff-0_2 = ["jiff-02"]
 with-serde_json-1 = ["serde-1", "serde_json-1"]
 with-smol_str-01 = ["smol_str-01"]
 with-uuid-0_8 = ["uuid-08"]
@@ -50,6 +51,7 @@ eui48-1 = { version = "1.0", package = "eui48", optional = true, default-feature
 geo-types-06 = { version = "0.6", package = "geo-types", optional = true }
 geo-types-0_7 = { version = "0.7", package = "geo-types", optional = true }
 jiff-01 = { version = "0.1", package = "jiff", optional = true }
+jiff-02 = { version = "0.2", package = "jiff", optional = true }
 serde-1 = { version = "1.0", package = "serde", optional = true }
 serde_json-1 = { version = "1.0", package = "serde_json", optional = true }
 uuid-08 = { version = "0.8", package = "uuid", optional = true }
diff --git a/postgres-types/src/jiff_02.rs b/postgres-types/src/jiff_02.rs
new file mode 100644
index 000000000..39844af29
--- /dev/null
+++ b/postgres-types/src/jiff_02.rs
@@ -0,0 +1,141 @@
+use bytes::BytesMut;
+use jiff_02::{
+    civil::{Date, DateTime, Time},
+    Span, SpanRound, Timestamp, Unit,
+};
+use postgres_protocol::types;
+use std::error::Error;
+
+use crate::{FromSql, IsNull, ToSql, Type};
+
+const fn base() -> DateTime {
+    DateTime::constant(2000, 1, 1, 0, 0, 0, 0)
+}
+
+/// The number of seconds from the Unix epoch to 2000-01-01 00:00:00 UTC.
+const PG_EPOCH: i64 = 946684800;
+
+fn base_ts() -> Timestamp {
+    Timestamp::new(PG_EPOCH, 0).unwrap()
+}
+
+fn round_us<'a>() -> SpanRound<'a> {
+    SpanRound::new().largest(Unit::Microsecond)
+}
+
+fn decode_err<E>(_e: E) -> Box<dyn Error + Sync + Send>
+where
+    E: Error,
+{
+    "value too large to decode".into()
+}
+
+fn transmit_err<E>(_e: E) -> Box<dyn Error + Sync + Send>
+where
+    E: Error,
+{
+    "value too large to transmit".into()
+}
+
+impl<'a> FromSql<'a> for DateTime {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<DateTime, Box<dyn Error + Sync + Send>> {
+        let v = types::timestamp_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| base().checked_add(s))
+            .map_err(decode_err)
+    }
+
+    accepts!(TIMESTAMP);
+}
+
+impl ToSql for DateTime {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = self
+            .since(base())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::timestamp_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIMESTAMP);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Timestamp {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Timestamp, Box<dyn Error + Sync + Send>> {
+        let v = types::timestamp_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| base_ts().checked_add(s))
+            .map_err(decode_err)
+    }
+
+    accepts!(TIMESTAMPTZ);
+}
+
+impl ToSql for Timestamp {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = self
+            .since(base_ts())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::timestamp_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIMESTAMPTZ);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Date {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Date, Box<dyn Error + Sync + Send>> {
+        let v = types::date_from_sql(raw)?;
+        Span::new()
+            .try_days(v)
+            .and_then(|s| base().date().checked_add(s))
+            .map_err(decode_err)
+    }
+    accepts!(DATE);
+}
+
+impl ToSql for Date {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = self.since(base().date()).map_err(transmit_err)?.get_days();
+        types::date_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(DATE);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Time {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Time, Box<dyn Error + Sync + Send>> {
+        let v = types::time_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| Time::midnight().checked_add(s))
+            .map_err(decode_err)
+    }
+
+    accepts!(TIME);
+}
+
+impl ToSql for Time {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = self
+            .since(Time::midnight())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::time_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIME);
+    to_sql_checked!();
+}
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index db044bcbd..51137b6b4 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -280,6 +280,8 @@ mod geo_types_06;
 mod geo_types_07;
 #[cfg(feature = "with-jiff-0_1")]
 mod jiff_01;
+#[cfg(feature = "with-jiff-0_2")]
+mod jiff_02;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-smol_str-01")]

From 3469ab046b2eb36cf7562fc32d67762ed864e5e7 Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Wed, 12 Feb 2025 15:52:34 -0500
Subject: [PATCH 095/106] WIP

---
 tokio-postgres/Cargo.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index e9cc5fcfc..cd2b699d4 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -37,6 +37,7 @@ with-eui48-1 = ["postgres-types/with-eui48-1"]
 with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]
 with-geo-types-0_7 = ["postgres-types/with-geo-types-0_7"]
 with-jiff-0_1 = ["postgres-types/with-jiff-0_1"]
+with-jiff-0_2 = ["postgres-types/with-jiff-0_2"]
 with-serde_json-1 = ["postgres-types/with-serde_json-1"]
 with-smol_str-01 = ["postgres-types/with-smol_str-01"]
 with-uuid-0_8 = ["postgres-types/with-uuid-0_8"]
@@ -85,6 +86,7 @@ eui48-1 = { version = "1.0", package = "eui48", default-features = false }
 geo-types-06 = { version = "0.6", package = "geo-types" }
 geo-types-07 = { version = "0.7", package = "geo-types" }
 jiff-01 = { version = "0.1", package = "jiff" }
+jiff-02 = { version = "0.2", package = "jiff" }
 serde-1 = { version = "1.0", package = "serde" }
 serde_json-1 = { version = "1.0", package = "serde_json" }
 smol_str-01 = { version = "0.1", package = "smol_str" }

From ddea059fc2e5943a71389679ee8ba7740e37a401 Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Sat, 15 Feb 2025 15:31:42 -0500
Subject: [PATCH 096/106] WIP

---
 tokio-postgres/tests/test/types/jiff_02.rs | 175 +++++++++++++++++++++
 tokio-postgres/tests/test/types/mod.rs     |   2 +
 2 files changed, 177 insertions(+)
 create mode 100644 tokio-postgres/tests/test/types/jiff_02.rs

diff --git a/tokio-postgres/tests/test/types/jiff_02.rs b/tokio-postgres/tests/test/types/jiff_02.rs
new file mode 100644
index 000000000..d13185589
--- /dev/null
+++ b/tokio-postgres/tests/test/types/jiff_02.rs
@@ -0,0 +1,175 @@
+use jiff_02::{
+    civil::{Date as JiffDate, DateTime, Time},
+    Timestamp as JiffTimestamp,
+};
+use std::fmt;
+use tokio_postgres::{
+    types::{Date, FromSqlOwned, Timestamp},
+    Client,
+};
+
+use crate::connect;
+use crate::types::test_type;
+
+#[tokio::test]
+async fn test_datetime_params() {
+    fn make_check(s: &str) -> (Option<DateTime>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_datetime_params() {
+    fn make_check(s: &str) -> (Timestamp<DateTime>, &str) {
+        (Timestamp::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_timestamp_params() {
+    fn make_check(s: &str) -> (Option<JiffTimestamp>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_timestamp_params() {
+    fn make_check(s: &str) -> (Timestamp<JiffTimestamp>, &str) {
+        (Timestamp::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_date_params() {
+    fn make_check(s: &str) -> (Option<JiffDate>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_date_params() {
+    fn make_check(s: &str) -> (Date<JiffDate>, &str) {
+        (Date::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (Date::PosInfinity, "'infinity'"),
+            (Date::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_time_params() {
+    fn make_check(s: &str) -> (Option<Time>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIME",
+        &[
+            make_check("'00:00:00.010000000'"),
+            make_check("'11:19:33.100314000'"),
+            make_check("'23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_special_params_without_wrapper() {
+    async fn assert_overflows<T>(client: &mut Client, val: &str, sql_type: &str)
+    where
+        T: FromSqlOwned + fmt::Debug,
+    {
+        let err = client
+            .query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
+            .await
+            .unwrap()
+            .try_get::<_, T>(0)
+            .unwrap_err();
+
+        assert_eq!(
+            err.to_string(),
+            "error deserializing column 0: value too large to decode"
+        );
+
+        let err = client
+            .query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
+            .await
+            .unwrap()
+            .try_get::<_, T>(0)
+            .unwrap_err();
+
+        assert_eq!(
+            err.to_string(),
+            "error deserializing column 0: value too large to decode"
+        );
+    }
+
+    let mut client = connect("user=postgres").await;
+
+    assert_overflows::<DateTime>(&mut client, "'-infinity'", "timestamp").await;
+    assert_overflows::<DateTime>(&mut client, "'infinity'", "timestamp").await;
+    assert_overflows::<JiffTimestamp>(&mut client, "'-infinity'", "timestamptz").await;
+    assert_overflows::<JiffTimestamp>(&mut client, "'infinity'", "timestamptz").await;
+    assert_overflows::<JiffDate>(&mut client, "'-infinity'", "date").await;
+    assert_overflows::<JiffDate>(&mut client, "'infinity'", "date").await;
+}
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index 875164c3b..41c4a8899 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -25,6 +25,8 @@ mod geo_types_06;
 mod geo_types_07;
 #[cfg(feature = "with-jiff-0_1")]
 mod jiff_01;
+#[cfg(feature = "with-jiff-0_2")]
+mod jiff_02;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-smol_str-01")]

From 7fe679742f9083073a1fea3335dde3aae44e2db3 Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Sat, 15 Feb 2025 15:32:03 -0500
Subject: [PATCH 097/106] WIP

---
 postgres/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index c5d055c31..06f6c7ff0 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -31,6 +31,7 @@ with-eui48-1 = ["tokio-postgres/with-eui48-1"]
 with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]
 with-geo-types-0_7 = ["tokio-postgres/with-geo-types-0_7"]
 with-jiff-0_1 = ["tokio-postgres/with-jiff-0_1"]
+with-jiff-0_2 = ["tokio-postgres/with-jiff-0_2"]
 with-serde_json-1 = ["tokio-postgres/with-serde_json-1"]
 with-smol_str-01 = ["tokio-postgres/with-smol_str-01"]
 with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]

From 0e1d04c52cf396e4d0ddf600f48d4346606c2f87 Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Sat, 15 Feb 2025 15:35:02 -0500
Subject: [PATCH 098/106] WIP

---
 postgres/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index 06f6c7ff0..5e7a78c93 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -37,7 +37,7 @@ with-smol_str-01 = ["tokio-postgres/with-smol_str-01"]
 with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]
 with-uuid-1 = ["tokio-postgres/with-uuid-1"]
 with-time-0_2 = ["tokio-postgres/with-time-0_2"]
-with-time-0_3 = ["tokio-postgres/with-time-0_3"]
+with-time-0_3 = ["tokio-postgres/with-time-0_3" ]
 
 [dependencies]
 bytes = "1.0"

From e26ebf545fa30e7690b209622d642151245525ec Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Sat, 15 Feb 2025 15:35:07 -0500
Subject: [PATCH 099/106] WIP

---
 postgres/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index 5e7a78c93..06f6c7ff0 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -37,7 +37,7 @@ with-smol_str-01 = ["tokio-postgres/with-smol_str-01"]
 with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]
 with-uuid-1 = ["tokio-postgres/with-uuid-1"]
 with-time-0_2 = ["tokio-postgres/with-time-0_2"]
-with-time-0_3 = ["tokio-postgres/with-time-0_3" ]
+with-time-0_3 = ["tokio-postgres/with-time-0_3"]
 
 [dependencies]
 bytes = "1.0"

From 3d3705c7605a9e74aa6731b3629fcb1ef355952a Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Sun, 16 Feb 2025 00:38:29 -0500
Subject: [PATCH 100/106] WIP

---
 postgres-types/src/jiff_02.rs          | 5 ++---
 tokio-postgres/tests/test/types/mod.rs | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/postgres-types/src/jiff_02.rs b/postgres-types/src/jiff_02.rs
index 39844af29..b14168700 100644
--- a/postgres-types/src/jiff_02.rs
+++ b/postgres-types/src/jiff_02.rs
@@ -51,9 +51,8 @@ impl<'a> FromSql<'a> for DateTime {
 
 impl ToSql for DateTime {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        let v = self
-            .since(base())
-            .and_then(|s| s.round(round_us()))
+        eprintln!("to_sql {:?}", self);
+        let v = dbg!(dbg!(self.since(base())).and_then(|s| s.round(round_us().relative(base()))))
             .map_err(transmit_err)?
             .get_microseconds();
         types::timestamp_to_sql(v, w);
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index 41c4a8899..adba7945a 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -55,6 +55,11 @@ where
         let result = rows[0].get(0);
         assert_eq!(val, &result);
 
+        eprintln!(
+            "val: {:?}, result: {:?}, sql_type: {}, repr: {}",
+            val, result, sql_type, repr
+        );
+
         let rows = client
             .query(&*format!("SELECT $1::{}", sql_type), &[&val])
             .await

From 7b8d796a344e98c6a974b407fed5eeccd10074eb Mon Sep 17 00:00:00 2001
From: "Shawn L." <shawn@sola.sh>
Date: Sun, 16 Feb 2025 00:40:07 -0500
Subject: [PATCH 101/106] WIP

---
 postgres-types/src/jiff_02.rs          | 1 -
 tokio-postgres/tests/test/types/mod.rs | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/postgres-types/src/jiff_02.rs b/postgres-types/src/jiff_02.rs
index b14168700..1db8e7239 100644
--- a/postgres-types/src/jiff_02.rs
+++ b/postgres-types/src/jiff_02.rs
@@ -51,7 +51,6 @@ impl<'a> FromSql<'a> for DateTime {
 
 impl ToSql for DateTime {
     fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
-        eprintln!("to_sql {:?}", self);
         let v = dbg!(dbg!(self.since(base())).and_then(|s| s.round(round_us().relative(base()))))
             .map_err(transmit_err)?
             .get_microseconds();
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index adba7945a..41c4a8899 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -55,11 +55,6 @@ where
         let result = rows[0].get(0);
         assert_eq!(val, &result);
 
-        eprintln!(
-            "val: {:?}, result: {:?}, sql_type: {}, repr: {}",
-            val, result, sql_type, repr
-        );
-
         let rows = client
             .query(&*format!("SELECT $1::{}", sql_type), &[&val])
             .await

From d7b2b08cc2c1c8817095cf7a635f53c96ad092ff Mon Sep 17 00:00:00 2001
From: lucasholten <lucasholten@dreamsolution.nl>
Date: Thu, 14 Nov 2024 15:46:32 +0100
Subject: [PATCH 102/106] Clearly indicate tademdrive changelog

---
 postgres-types/CHANGELOG.md | 5 +----
 tokio-postgres/CHANGELOG.md | 7 +++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/postgres-types/CHANGELOG.md b/postgres-types/CHANGELOG.md
index 702cd5ef6..225c15315 100644
--- a/postgres-types/CHANGELOG.md
+++ b/postgres-types/CHANGELOG.md
@@ -1,11 +1,8 @@
 # Change Log
 
-### Added
+## TandemDrive
 
 * Upgraded support for `chrono-tz` to 0.10. Use the `with-chrono-tz-0_10` feature to enable it.
-
-### Added
-
 * Added support for `chrono-tz` 0.9 via the `with-chrono-tz-0_9` feature.
 
 ## v0.2.6 - 2023-08-19
diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index 486ada8c1..3ae9feeeb 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -1,15 +1,14 @@
 # Change Log
 
-## Unreleased
+## TandemDrive
 
 * Disable `rustc-serialize` compatibility of `eui48-1` dependency
 * Remove tests for `eui48-04`
 * Add `table_oid` and `field_id` fields to `Columns` struct of prepared statements.
-
-## Added
-
 * Added support for `chrono-tz` 0.9 via the `chrono-tz-0_9` feature.
 
+## Unreleased
+
 ## v0.7.10 - 2023-08-25
 
 ## Fixed

From f1c600dfb1066e47d416d33697c6593a821f6f79 Mon Sep 17 00:00:00 2001
From: lucasholten <lucasholten@dreamsolution.nl>
Date: Thu, 27 Feb 2025 14:48:11 +0100
Subject: [PATCH 103/106] Update changelog.

---
 tokio-postgres/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index 3ae9feeeb..7b2139064 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Remove tests for `eui48-04`
 * Add `table_oid` and `field_id` fields to `Columns` struct of prepared statements.
 * Added support for `chrono-tz` 0.9 via the `chrono-tz-0_9` feature.
+* Pretty print error location.
 
 ## Unreleased
 

From 9bdfda24c17aacda6765291e0db3060c83050265 Mon Sep 17 00:00:00 2001
From: lucasholten <lucasholten@dreamsolution.nl>
Date: Thu, 27 Feb 2025 15:36:17 +0100
Subject: [PATCH 104/106] Fix changelog

---
 tokio-postgres/CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
index 85a41023b..2a322061e 100644
--- a/tokio-postgres/CHANGELOG.md
+++ b/tokio-postgres/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 ## TandemDrive
 
-* Add `table_oid` and `field_id` fields to `Columns` struct of prepared statements.
 * Added support for `chrono-tz` 0.9 via the `chrono-tz-0_9` feature.
 * Pretty print error location.
 

From cbe70acb79c6f3f3b546a40b604317a9824bb1cb Mon Sep 17 00:00:00 2001
From: lucasholten <lucasholten@dreamsolution.nl>
Date: Thu, 27 Feb 2025 15:46:55 +0100
Subject: [PATCH 105/106] Fix clippy

---
 postgres-types/src/chrono_04.rs   | 12 ++++++------
 postgres/src/transaction.rs       |  2 +-
 tokio-postgres/src/transaction.rs |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/postgres-types/src/chrono_04.rs b/postgres-types/src/chrono_04.rs
index b6f21ff42..4b4708bca 100644
--- a/postgres-types/src/chrono_04.rs
+++ b/postgres-types/src/chrono_04.rs
@@ -14,7 +14,7 @@ fn base() -> NaiveDateTime {
         .unwrap()
 }
 
-impl<'a> FromSql<'a> for NaiveDateTime {
+impl FromSql<'_> for NaiveDateTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<NaiveDateTime, Box<dyn Error + Sync + Send>> {
         let t = types::timestamp_from_sql(raw)?;
         base()
@@ -39,7 +39,7 @@ impl ToSql for NaiveDateTime {
     to_sql_checked!();
 }
 
-impl<'a> FromSql<'a> for DateTime<Utc> {
+impl FromSql<'_> for DateTime<Utc> {
     fn from_sql(type_: &Type, raw: &[u8]) -> Result<DateTime<Utc>, Box<dyn Error + Sync + Send>> {
         let naive = NaiveDateTime::from_sql(type_, raw)?;
         Ok(Utc.from_utc_datetime(&naive))
@@ -61,7 +61,7 @@ impl ToSql for DateTime<Utc> {
     to_sql_checked!();
 }
 
-impl<'a> FromSql<'a> for DateTime<Local> {
+impl FromSql<'_> for DateTime<Local> {
     fn from_sql(type_: &Type, raw: &[u8]) -> Result<DateTime<Local>, Box<dyn Error + Sync + Send>> {
         let utc = DateTime::<Utc>::from_sql(type_, raw)?;
         Ok(utc.with_timezone(&Local))
@@ -83,7 +83,7 @@ impl ToSql for DateTime<Local> {
     to_sql_checked!();
 }
 
-impl<'a> FromSql<'a> for DateTime<FixedOffset> {
+impl FromSql<'_> for DateTime<FixedOffset> {
     fn from_sql(
         type_: &Type,
         raw: &[u8],
@@ -108,7 +108,7 @@ impl ToSql for DateTime<FixedOffset> {
     to_sql_checked!();
 }
 
-impl<'a> FromSql<'a> for NaiveDate {
+impl FromSql<'_> for NaiveDate {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<NaiveDate, Box<dyn Error + Sync + Send>> {
         let jd = types::date_from_sql(raw)?;
         base()
@@ -135,7 +135,7 @@ impl ToSql for NaiveDate {
     to_sql_checked!();
 }
 
-impl<'a> FromSql<'a> for NaiveTime {
+impl FromSql<'_> for NaiveTime {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<NaiveTime, Box<dyn Error + Sync + Send>> {
         let usec = types::time_from_sql(raw)?;
         Ok(NaiveTime::from_hms_opt(0, 0, 0).unwrap() + Duration::microseconds(usec))
diff --git a/postgres/src/transaction.rs b/postgres/src/transaction.rs
index e794cf76a..f2d15be21 100644
--- a/postgres/src/transaction.rs
+++ b/postgres/src/transaction.rs
@@ -14,7 +14,7 @@ pub struct Transaction<'a> {
     transaction: Option<tokio_postgres::Transaction<'a>>,
 }
 
-impl<'a> fmt::Debug for Transaction<'a> {
+impl fmt::Debug for Transaction<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Debug::fmt(&self.transaction, f)
     }
diff --git a/tokio-postgres/src/transaction.rs b/tokio-postgres/src/transaction.rs
index ffed6bc48..4941c111e 100644
--- a/tokio-postgres/src/transaction.rs
+++ b/tokio-postgres/src/transaction.rs
@@ -30,7 +30,7 @@ pub struct Transaction<'a> {
     done: bool,
 }
 
-impl<'a> fmt::Debug for Transaction<'a> {
+impl fmt::Debug for Transaction<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Transaction")
             .field("savepoint", &self.savepoint)
@@ -444,7 +444,7 @@ impl<'a> Transaction<'a> {
     }
 }
 
-impl<'a> Deref for Transaction<'a> {
+impl Deref for Transaction<'_> {
     type Target = Client;
 
     fn deref(&self) -> &Self::Target {

From 5448b0deba92465fa0ee5f768f8dc38426162d0c Mon Sep 17 00:00:00 2001
From: lucasholten <lucasholten@dreamsolution.nl>
Date: Tue, 4 Mar 2025 12:11:04 +0100
Subject: [PATCH 106/106] Fix clippy

---
 postgres-range/src/lib.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/postgres-range/src/lib.rs b/postgres-range/src/lib.rs
index 6215c0bb2..572191a9c 100644
--- a/postgres-range/src/lib.rs
+++ b/postgres-range/src/lib.rs
@@ -424,6 +424,10 @@ where
     }
 
     /// Determines if a value lies within this range.
+    #[expect(
+        clippy::unnecessary_map_or,
+        reason = "is_none_or is not available on 1.81 which is used in CI"
+    )]
     pub fn contains(&self, value: &T) -> bool {
         match self.inner {
             Empty => false,