Update to postgres 18.0

This commit updates the bundled libpq version to that one from the
postgres 18.0 release. It also regenerates the bindings to match the
bundled libpq version. Finally it enables the pkg-config feature by
default to make compiling in linux like environments a bit easier.

Author: weiznich

.github/workflows/ci.yml

@@ -77,6 +77,8 @@ jobs:
 
       - name: Install rust toolchain
         uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
 
       - name: Check
         shell: bash

CHANGELOG.md

@@ -5,6 +5,12 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
 
 ## Unreleased
 
+### pq-sys [0.7.4] 2025-xx-xx
+
+* Update the bundled version of libpq to 18.0
+* Regenerate bindings for the new postgres release
+* Enable the `pkg-config` feature by default
+
 ### pq-sys [0.7.2] 2025-06-12
 
 * Bump bindgen to 0.72.0 and regenerate bindings

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pq-sys"
-version = "0.7.2"
+version = "0.7.3"
 description = "Auto-generated rust bindings for libpq"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/sgrif/pq-sys"
@@ -31,7 +31,7 @@ similar-asserts = "1.6.0"
 bindgen = "0.72.0"
 
 [features]
-default = []
+default = ["pkg-config"]
 bundled = ["bundled_without_openssl", "pq-src/with-openssl"]
 bundled_without_openssl = ["dep:pq-src"]
 buildtime_bindgen = ["dep:bindgen"]

pq-src/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pq-src"
-version = "0.3.9+libpq-17.5"
+version = "0.3.10+libpq-18.0"
 edition = "2021"
 include = [
         "src/**/*.rs",
@@ -46,6 +46,8 @@ include = [
         "source/src/include/common/cryptohash.h",
         "source/src/include/common/scram-common.h",
         "source/src/include/common/sha2.h",
+        "source/src/include/datatype/timestamp.h",
+        "source/src/include/pgtime.h",
         "source/src/common/sha2_int.h",
         "source/src/common/sha1_int.h",
         "source/src/include/common/sha1.h",
@@ -69,7 +71,9 @@ include = [
         "source/src/include/common/unicode_east_asian_fw_table.h",
         "source/src/include/common/restricted_token.h",
         "source/src/include/common/openssl.h",
+        "source/src/include/libpq/pg-gssapi.h",
         "source/src/include/mb/pg_wchar.h",
+        "source/src/include/miscadmin.h",
         "source/src/include/utils/ascii.h",
         "source/src/include/lib/sort_template.h",
         "source/src/include/lib/stringinfo.h",
@@ -186,6 +190,9 @@ include = [
         "source/src/interfaces/libpq/fe-auth-sasl.h",
         "source/src/interfaces/libpq/pqexpbuffer.h",
         "source/src/interfaces/libpq/libpq-events.h",
+        "source/src/include/common/oauth-common.h",
+        "source/src/interfaces/libpq/fe-auth-oauth.h",
+        "source/src/interfaces/libpq/fe-auth-oauth.c",
 ]
 description = "Bundled version of libpq"
 license = "PostgreSQL"

pq-src/additional_include/pg_config.h

@@ -80,6 +80,11 @@
 #define STRERROR_R_INT 1
 #endif
 
+/* Define to 1 if you have the <xlocale.h> header file. */
+#ifdef __APPLE__
+#define HAVE_XLOCALE_H 1
+#endif
+
 #endif
 
 // windows does not have that header
@@ -168,9 +173,7 @@
 #define PG_VERSION_NUM 160000
 
 /* A string containing the version number, platform, and C compiler */
-#define PG_VERSION_STR                                                         \
-  "PostgreSQL 16.0 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 13.2.1 "      \
-  "20230728 (Red Hat 13.2.1-1), 64-bit"
+#define PG_VERSION_STR "PostgreSQL 18.0"
 
 /* RELSEG_SIZE is the maximum number of blocks allowed in one disk file. Thus,
    the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger

pq-src/build.rs

@@ -31,12 +31,12 @@ const LIBPORTS_BASE: &[&str] = &[
 // If you update this file list also
 // update the list of includes files in
 // the Cargo.toml file
-const LIBPORTS_LINUX: &[&str] = &["getpeereid.c", "user.c"];
+const LIBPORTS_LINUX: &[&str] = &["getpeereid.c"];
 
 // If you update this file list also
 // update the list of includes files in
 // the Cargo.toml file
-const LIBPORTS_MACOS: &[&str] = &["user.c"];
+const LIBPORTS_MACOS: &[&str] = &[];
 
 // If you update this file list also
 // update the list of includes files in
@@ -100,11 +100,7 @@ const LIBCOMMON_BASE: &[&str] = &[
 // If you update this file list also
 // update the list of includes files in
 // the Cargo.toml file
-const LIBCOMMON_OPENSSL: &[&str] = &[
-    "cryptohash_openssl.c",
-    "hmac_openssl.c",
-    "protocol_openssl.c",
-];
+const LIBCOMMON_OPENSSL: &[&str] = &["cryptohash_openssl.c", "hmac_openssl.c"];
 
 // If you update this file list also
 // update the list of includes files in
@@ -136,6 +132,7 @@ const LIBPQ_BASE: &[&str] = &[
     "fe-protocol3.c",
     "fe-secure.c",
     "fe-trace.c",
+    "fe-auth-oauth.c",
     "legacy-pqsignal.c",
     "libpq-events.c",
     "pqexpbuffer.c",

pq-src/source

@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.72.0 */
+/* automatically generated by rust-bindgen 0.72.1 */
 
 use libc::FILE;
 
@@ -29,6 +29,8 @@ pub const LIBPQ_HAS_CHUNK_MODE: u32 = 1;
 pub const LIBPQ_HAS_CLOSE_PREPARED: u32 = 1;
 pub const LIBPQ_HAS_SEND_PIPELINE_SYNC: u32 = 1;
 pub const LIBPQ_HAS_SOCKET_POLL: u32 = 1;
+pub const LIBPQ_HAS_FULL_PROTOCOL_VERSION: u32 = 1;
+pub const LIBPQ_HAS_PROMPT_OAUTH_DEVICE: u32 = 1;
 pub const PG_COPYRES_ATTRS: u32 = 1;
 pub const PG_COPYRES_TUPLES: u32 = 2;
 pub const PG_COPYRES_EVENTS: u32 = 4;
@@ -38,7 +40,7 @@ pub const PQTRACE_REGRESS_MODE: u32 = 2;
 pub const PQ_QUERY_PARAM_MAX_LIMIT: u32 = 65535;
 pub const PQnoPasswordSupplied: &[u8; 35] = b"fe_sendauth: no password supplied\n\0";
 pub type Oid = ::std::os::raw::c_uint;
-pub type pg_int64 = ::std::os::raw::c_long;
+pub type pg_int64 = i64;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum ConnStatusType {
@@ -57,6 +59,7 @@ pub enum ConnStatusType {
     CONNECTION_CHECK_TARGET = 12,
     CONNECTION_CHECK_STANDBY = 13,
     CONNECTION_ALLOCATED = 14,
+    CONNECTION_AUTHENTICATING = 15,
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
@@ -123,6 +126,12 @@ pub enum PGpipelineStatus {
     PQ_PIPELINE_ON = 1,
     PQ_PIPELINE_ABORTED = 2,
 }
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum PGauthData {
+    PQAUTHDATA_PROMPT_OAUTH_DEVICE = 0,
+    PQAUTHDATA_OAUTH_BEARER_TOKEN = 1,
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pg_conn {
@@ -165,7 +174,7 @@ const _: () = {
     ["Offset of field: pgNotify::next"][::std::mem::offset_of!(pgNotify, next) - 24usize];
 };
 pub type PGnotify = pgNotify;
-pub type pg_usec_time_t = pg_int64;
+pub type pg_usec_time_t = i64;
 pub type PQnoticeReceiver = ::std::option::Option<
     unsafe extern "C" fn(arg: *mut ::std::os::raw::c_void, res: *const PGresult),
 >;
@@ -444,6 +453,9 @@ unsafe extern "C" {
 unsafe extern "C" {
     pub fn PQprotocolVersion(conn: *const PGconn) -> ::std::os::raw::c_int;
 }
+unsafe extern "C" {
+    pub fn PQfullProtocolVersion(conn: *const PGconn) -> ::std::os::raw::c_int;
+}
 unsafe extern "C" {
     pub fn PQserverVersion(conn: *const PGconn) -> ::std::os::raw::c_int;
 }
@@ -1036,9 +1048,9 @@ unsafe extern "C" {
     pub fn lo_lseek64(
         conn: *mut PGconn,
         fd: ::std::os::raw::c_int,
-        offset: pg_int64,
+        offset: i64,
         whence: ::std::os::raw::c_int,
-    ) -> pg_int64;
+    ) -> i64;
 }
 unsafe extern "C" {
     pub fn lo_creat(conn: *mut PGconn, mode: ::std::os::raw::c_int) -> Oid;
@@ -1050,7 +1062,7 @@ unsafe extern "C" {
     pub fn lo_tell(conn: *mut PGconn, fd: ::std::os::raw::c_int) -> ::std::os::raw::c_int;
 }
 unsafe extern "C" {
-    pub fn lo_tell64(conn: *mut PGconn, fd: ::std::os::raw::c_int) -> pg_int64;
+    pub fn lo_tell64(conn: *mut PGconn, fd: ::std::os::raw::c_int) -> i64;
 }
 unsafe extern "C" {
     pub fn lo_truncate(
@@ -1063,7 +1075,7 @@ unsafe extern "C" {
     pub fn lo_truncate64(
         conn: *mut PGconn,
         fd: ::std::os::raw::c_int,
-        len: pg_int64,
+        len: i64,
     ) -> ::std::os::raw::c_int;
 }
 unsafe extern "C" {
@@ -1121,6 +1133,63 @@ unsafe extern "C" {
 unsafe extern "C" {
     pub fn PQenv2encoding() -> ::std::os::raw::c_int;
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct _PGpromptOAuthDevice {
+    pub verification_uri: *const ::std::os::raw::c_char,
+    pub user_code: *const ::std::os::raw::c_char,
+    pub verification_uri_complete: *const ::std::os::raw::c_char,
+    pub expires_in: ::std::os::raw::c_int,
+}
+#[allow(clippy::unnecessary_operation, clippy::identity_op)]
+const _: () = {
+    ["Size of _PGpromptOAuthDevice"][::std::mem::size_of::<_PGpromptOAuthDevice>() - 32usize];
+    ["Alignment of _PGpromptOAuthDevice"][::std::mem::align_of::<_PGpromptOAuthDevice>() - 8usize];
+    ["Offset of field: _PGpromptOAuthDevice::verification_uri"]
+        [::std::mem::offset_of!(_PGpromptOAuthDevice, verification_uri) - 0usize];
+    ["Offset of field: _PGpromptOAuthDevice::user_code"]
+        [::std::mem::offset_of!(_PGpromptOAuthDevice, user_code) - 8usize];
+    ["Offset of field: _PGpromptOAuthDevice::verification_uri_complete"]
+        [::std::mem::offset_of!(_PGpromptOAuthDevice, verification_uri_complete) - 16usize];
+    ["Offset of field: _PGpromptOAuthDevice::expires_in"]
+        [::std::mem::offset_of!(_PGpromptOAuthDevice, expires_in) - 24usize];
+};
+pub type PGpromptOAuthDevice = _PGpromptOAuthDevice;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct PGoauthBearerRequest {
+    pub openid_configuration: *const ::std::os::raw::c_char,
+    pub scope: *const ::std::os::raw::c_char,
+    pub async_: ::std::option::Option<
+        unsafe extern "C" fn(
+            conn: *mut PGconn,
+            request: *mut PGoauthBearerRequest,
+            altsock: *mut ::std::os::raw::c_int,
+        ) -> PostgresPollingStatusType,
+    >,
+    pub cleanup: ::std::option::Option<
+        unsafe extern "C" fn(conn: *mut PGconn, request: *mut PGoauthBearerRequest),
+    >,
+    pub token: *mut ::std::os::raw::c_char,
+    pub user: *mut ::std::os::raw::c_void,
+}
+#[allow(clippy::unnecessary_operation, clippy::identity_op)]
+const _: () = {
+    ["Size of PGoauthBearerRequest"][::std::mem::size_of::<PGoauthBearerRequest>() - 48usize];
+    ["Alignment of PGoauthBearerRequest"][::std::mem::align_of::<PGoauthBearerRequest>() - 8usize];
+    ["Offset of field: PGoauthBearerRequest::openid_configuration"]
+        [::std::mem::offset_of!(PGoauthBearerRequest, openid_configuration) - 0usize];
+    ["Offset of field: PGoauthBearerRequest::scope"]
+        [::std::mem::offset_of!(PGoauthBearerRequest, scope) - 8usize];
+    ["Offset of field: PGoauthBearerRequest::async_"]
+        [::std::mem::offset_of!(PGoauthBearerRequest, async_) - 16usize];
+    ["Offset of field: PGoauthBearerRequest::cleanup"]
+        [::std::mem::offset_of!(PGoauthBearerRequest, cleanup) - 24usize];
+    ["Offset of field: PGoauthBearerRequest::token"]
+        [::std::mem::offset_of!(PGoauthBearerRequest, token) - 32usize];
+    ["Offset of field: PGoauthBearerRequest::user"]
+        [::std::mem::offset_of!(PGoauthBearerRequest, user) - 40usize];
+};
 unsafe extern "C" {
     pub fn PQencryptPassword(
         passwd: *const ::std::os::raw::c_char,
@@ -1142,6 +1211,26 @@ unsafe extern "C" {
         passwd: *const ::std::os::raw::c_char,
     ) -> *mut PGresult;
 }
+pub type PQauthDataHook_type = ::std::option::Option<
+    unsafe extern "C" fn(
+        type_: PGauthData,
+        conn: *mut PGconn,
+        data: *mut ::std::os::raw::c_void,
+    ) -> ::std::os::raw::c_int,
+>;
+unsafe extern "C" {
+    pub fn PQsetAuthDataHook(hook: PQauthDataHook_type);
+}
+unsafe extern "C" {
+    pub fn PQgetAuthDataHook() -> PQauthDataHook_type;
+}
+unsafe extern "C" {
+    pub fn PQdefaultAuthDataHook(
+        type_: PGauthData,
+        conn: *mut PGconn,
+        data: *mut ::std::os::raw::c_void,
+    ) -> ::std::os::raw::c_int;
+}
 unsafe extern "C" {
     pub fn pg_char_to_encoding(name: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
 }