From e71335ee43978311b2c1f253afef6c92abdaac88 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 1 May 2023 19:33:49 -0400
Subject: [PATCH] fix serialization of oidvector

---
 postgres-types/src/lib.rs              |  8 +++++++-
 tokio-postgres/src/connect_socket.rs   |  4 +++-
 tokio-postgres/tests/test/types/mod.rs | 11 +++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 291e069d..c4c448c4 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -910,9 +910,15 @@ impl<'a, T: ToSql> ToSql for &'a [T] {
             _ => panic!("expected array type"),
         };
 
+        // Arrays are normally one indexed by default but oidvector *requires* zero indexing
+        let lower_bound = match *ty {
+            Type::OID_VECTOR => 0,
+            _ => 1,
+        };
+
         let dimension = ArrayDimension {
             len: downcast(self.len())?,
-            lower_bound: 1,
+            lower_bound,
         };
 
         types::array_to_sql(
diff --git a/tokio-postgres/src/connect_socket.rs b/tokio-postgres/src/connect_socket.rs
index 9b3d31d7..1204ca1f 100644
--- a/tokio-postgres/src/connect_socket.rs
+++ b/tokio-postgres/src/connect_socket.rs
@@ -14,7 +14,9 @@ pub(crate) async fn connect_socket(
     host: &Host,
     port: u16,
     connect_timeout: Option<Duration>,
-    tcp_user_timeout: Option<Duration>,
+    #[cfg_attr(not(target_os = "linux"), allow(unused_variables))] tcp_user_timeout: Option<
+        Duration,
+    >,
     keepalive_config: Option<&KeepaliveConfig>,
 ) -> Result<Socket, Error> {
     match host {
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index 452d149f..0f1d3824 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -739,3 +739,14 @@ async fn ltxtquery_any() {
     )
     .await;
 }
+
+#[tokio::test]
+async fn oidvector() {
+    test_type(
+        "oidvector",
+        // NB: postgres does not support empty oidarrays! All empty arrays are normalized to zero dimensions, but the
+        // oidvectorrecv function requires exactly one dimension.
+        &[(Some(vec![0u32, 1, 2]), "ARRAY[0,1,2]"), (None, "NULL")],
+    )
+    .await;
+}