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] 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
     }