From 46c9abeaffac4bac720b344190b2c4ae6b3b1aae Mon Sep 17 00:00:00 2001 From: Eric Ridge Date: Mon, 9 Sep 2024 09:04:16 -0400 Subject: [PATCH] Update version to 0.12.3 (#1847) Welcome to pgrx v0.12.3. This point release upgrades to use the new Postgres 17rc1. As usual, please `cargo install cargo-pgrx --version 0.12.3 --locked`. Then you can run `cargo pgrx upgrade` in your extension crate's root to update its dependencies. ## What's Changed * Fixups of issues left from #1837 by @YohDeadfall in https://github.com/pgcentralfoundation/pgrx/pull/1843 * move to Postgres v17rc1 by @eeeebbbbrrrr in https://github.com/pgcentralfoundation/pgrx/pull/1846 **Full Changelog**: https://github.com/pgcentralfoundation/pgrx/compare/v0.12.2...v0.12.3 --- Cargo.lock | 16 +++++------ Cargo.toml | 10 +++---- cargo-pgrx/Cargo.toml | 2 +- cargo-pgrx/src/templates/cargo_toml | 4 +-- pgrx-bindgen/Cargo.toml | 2 +- pgrx-macros/Cargo.toml | 2 +- pgrx-pg-config/Cargo.toml | 2 +- pgrx-pg-sys/Cargo.toml | 2 +- pgrx-pg-sys/src/include/pg17.rs | 41 +++++++++++------------------ pgrx-sql-entity-graph/Cargo.toml | 2 +- pgrx-tests/Cargo.toml | 4 +-- pgrx/Cargo.toml | 2 +- 12 files changed, 40 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a3dd9f0b..d866e3f00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -308,7 +308,7 @@ dependencies = [ [[package]] name = "cargo-pgrx" -version = "0.12.2" +version = "0.12.3" dependencies = [ "bzip2", "cargo-edit", @@ -1484,7 +1484,7 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.12.2" +version = "0.12.3" dependencies = [ "atomic-traits", "bitflags 2.4.2", @@ -1506,7 +1506,7 @@ dependencies = [ [[package]] name = "pgrx-bindgen" -version = "0.12.2" +version = "0.12.3" dependencies = [ "bindgen", "clang-sys", @@ -1521,7 +1521,7 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.12.2" +version = "0.12.3" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", @@ -1532,7 +1532,7 @@ dependencies = [ [[package]] name = "pgrx-pg-config" -version = "0.12.2" +version = "0.12.3" dependencies = [ "cargo_toml", "eyre", @@ -1548,7 +1548,7 @@ dependencies = [ [[package]] name = "pgrx-pg-sys" -version = "0.12.2" +version = "0.12.3" dependencies = [ "cee-scape", "libc", @@ -1561,7 +1561,7 @@ dependencies = [ [[package]] name = "pgrx-sql-entity-graph" -version = "0.12.2" +version = "0.12.3" dependencies = [ "convert_case", "eyre", @@ -1577,7 +1577,7 @@ dependencies = [ [[package]] name = "pgrx-tests" -version = "0.12.2" +version = "0.12.3" dependencies = [ "clap-cargo 0.14.0", "eyre", diff --git a/Cargo.toml b/Cargo.toml index a29b39cfb..4e154fd4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,11 +54,11 @@ exclude = [ cargo-pgrx = { path = "cargo-pgrx" } [workspace.dependencies] -pgrx-macros = { path = "./pgrx-macros", version = "=0.12.2" } -pgrx-pg-sys = { path = "./pgrx-pg-sys", version = "=0.12.2" } -pgrx-sql-entity-graph = { path = "./pgrx-sql-entity-graph", version = "=0.12.2" } -pgrx-pg-config = { path = "./pgrx-pg-config", version = "=0.12.2" } -pgrx-bindgen = { path = "./pgrx-bindgen", version = "0.12.2" } +pgrx-macros = { path = "./pgrx-macros", version = "=0.12.3" } +pgrx-pg-sys = { path = "./pgrx-pg-sys", version = "=0.12.3" } +pgrx-sql-entity-graph = { path = "./pgrx-sql-entity-graph", version = "=0.12.3" } +pgrx-pg-config = { path = "./pgrx-pg-config", version = "=0.12.3" } +pgrx-bindgen = { path = "./pgrx-bindgen", version = "0.12.3" } cargo_metadata = "0.18.0" cargo-edit = "0.12.2" # format-preserving edits to cargo.toml diff --git a/cargo-pgrx/Cargo.toml b/cargo-pgrx/Cargo.toml index d1ad7f016..bdff45bb3 100644 --- a/cargo-pgrx/Cargo.toml +++ b/cargo-pgrx/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "cargo-pgrx" -version = "0.12.2" +version = "0.12.3" authors = ["PgCentral Foundation, Inc. "] license = "MIT" description = "Cargo subcommand for 'pgrx' to make Postgres extension development easy" diff --git a/cargo-pgrx/src/templates/cargo_toml b/cargo-pgrx/src/templates/cargo_toml index 2895740b4..2efd570b4 100644 --- a/cargo-pgrx/src/templates/cargo_toml +++ b/cargo-pgrx/src/templates/cargo_toml @@ -21,10 +21,10 @@ pg17 = ["pgrx/pg17", "pgrx-tests/pg17" ] pg_test = [] [dependencies] -pgrx = "=0.12.2" +pgrx = "=0.12.3" [dev-dependencies] -pgrx-tests = "=0.12.2" +pgrx-tests = "=0.12.3" [profile.dev] panic = "unwind" diff --git a/pgrx-bindgen/Cargo.toml b/pgrx-bindgen/Cargo.toml index 0c5b784ce..2a2e8adb3 100644 --- a/pgrx-bindgen/Cargo.toml +++ b/pgrx-bindgen/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pgrx-bindgen" description = "additional bindgen support for pgrx" -version = "0.12.2" +version = "0.12.3" edition = "2021" license = "MIT" homepage = "https://github.com/pgcentralfoundation/pgrx" diff --git a/pgrx-macros/Cargo.toml b/pgrx-macros/Cargo.toml index 34eaab3db..613894a39 100644 --- a/pgrx-macros/Cargo.toml +++ b/pgrx-macros/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "pgrx-macros" -version = "0.12.2" +version = "0.12.3" authors = ["PgCentral Foundation, Inc. "] license = "MIT" description = "Proc Macros for 'pgrx'" diff --git a/pgrx-pg-config/Cargo.toml b/pgrx-pg-config/Cargo.toml index 67c33bf9d..dc0bda50f 100644 --- a/pgrx-pg-config/Cargo.toml +++ b/pgrx-pg-config/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "pgrx-pg-config" -version = "0.12.2" +version = "0.12.3" authors = ["PgCentral Foundation, Inc. "] license = "MIT" description = "A Postgres pg_config wrapper for 'pgrx'" diff --git a/pgrx-pg-sys/Cargo.toml b/pgrx-pg-sys/Cargo.toml index 1eed19128..20fd3fea1 100644 --- a/pgrx-pg-sys/Cargo.toml +++ b/pgrx-pg-sys/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "pgrx-pg-sys" -version = "0.12.2" +version = "0.12.3" authors = ["PgCentral Foundation, Inc. "] license = "MIT" description = "Generated Rust bindings for Postgres internals, for use with 'pgrx'" diff --git a/pgrx-pg-sys/src/include/pg17.rs b/pgrx-pg-sys/src/include/pg17.rs index 1d692d26f..b573fa087 100644 --- a/pgrx-pg-sys/src/include/pg17.rs +++ b/pgrx-pg-sys/src/include/pg17.rs @@ -146,7 +146,7 @@ pub const PACKAGE_NAME: &::core::ffi::CStr = unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"PostgreSQL\0") }; #[allow(unsafe_code)] pub const PACKAGE_STRING: &::core::ffi::CStr = - unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"PostgreSQL 17beta3\0") }; + unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"PostgreSQL 17rc1\0") }; #[allow(unsafe_code)] pub const PACKAGE_TARNAME: &::core::ffi::CStr = unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"postgresql\0") }; @@ -155,7 +155,7 @@ pub const PACKAGE_URL: &::core::ffi::CStr = unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"https://www.postgresql.org/\0") }; #[allow(unsafe_code)] pub const PACKAGE_VERSION: &::core::ffi::CStr = - unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"17beta3\0") }; + unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"17rc1\0") }; #[allow(unsafe_code)] pub const PG_KRB_SRVNAM: &::core::ffi::CStr = unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"postgres\0") }; @@ -167,11 +167,11 @@ pub const PG_MINORVERSION_NUM: u32 = 0; pub const PG_USE_STDBOOL: u32 = 1; #[allow(unsafe_code)] pub const PG_VERSION: &::core::ffi::CStr = - unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"17beta3\0") }; + unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"17rc1\0") }; pub const PG_VERSION_NUM: u32 = 170000; #[allow(unsafe_code)] pub const PG_VERSION_STR: &::core::ffi::CStr = unsafe { - :: core :: ffi :: CStr :: from_bytes_with_nul_unchecked (b"PostgreSQL 17beta3 on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, 64-bit\0") + :: core :: ffi :: CStr :: from_bytes_with_nul_unchecked (b"PostgreSQL 17rc1 on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, 64-bit\0") }; pub const RELSEG_SIZE: u32 = 131072; pub const SIZEOF_BOOL: u32 = 1; @@ -578,9 +578,8 @@ pub const PG_BINARY_W: &::core::ffi::CStr = unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"w\0") }; pub const PGINVALID_SOCKET: i32 = -1; #[allow(unsafe_code)] -pub const PG_BACKEND_VERSIONSTR: &::core::ffi::CStr = unsafe { - ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"postgres (PostgreSQL) 17beta3\n\0") -}; +pub const PG_BACKEND_VERSIONSTR: &::core::ffi::CStr = + unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"postgres (PostgreSQL) 17rc1\n\0") }; #[allow(unsafe_code)] pub const EXE: &::core::ffi::CStr = unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(b"\0") }; @@ -3162,6 +3161,7 @@ pub const GUC_IS_NAME: u32 = 2048; pub const GUC_NOT_WHILE_SEC_REST: u32 = 4096; pub const GUC_DISALLOW_IN_AUTO_FILE: u32 = 8192; pub const GUC_RUNTIME_COMPUTED: u32 = 16384; +pub const GUC_ALLOW_IN_PARALLEL: u32 = 32768; pub const GUC_UNIT_KB: u32 = 16777216; pub const GUC_UNIT_BLOCKS: u32 = 33554432; pub const GUC_UNIT_XBLOCKS: u32 = 50331648; @@ -17061,8 +17061,6 @@ impl Default for PartitionRangeDatum { #[derive(Debug, Copy, Clone)] pub struct SinglePartitionSpec { pub type_: NodeTag, - pub name: *mut RangeVar, - pub bound: *mut PartitionBoundSpec, } impl Default for SinglePartitionSpec { fn default() -> Self { @@ -17079,7 +17077,6 @@ pub struct PartitionCmd { pub type_: NodeTag, pub name: *mut RangeVar, pub bound: *mut PartitionBoundSpec, - pub partlist: *mut List, pub concurrent: bool, } impl Default for PartitionCmd { @@ -18164,12 +18161,10 @@ pub mod AlterTableType { pub const AT_AttachPartition: Type = 60; pub const AT_DetachPartition: Type = 61; pub const AT_DetachPartitionFinalize: Type = 62; - pub const AT_SplitPartition: Type = 63; - pub const AT_MergePartitions: Type = 64; - pub const AT_AddIdentity: Type = 65; - pub const AT_SetIdentity: Type = 66; - pub const AT_DropIdentity: Type = 67; - pub const AT_ReAddStatistics: Type = 68; + pub const AT_AddIdentity: Type = 63; + pub const AT_SetIdentity: Type = 64; + pub const AT_DropIdentity: Type = 65; + pub const AT_ReAddStatistics: Type = 66; } #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -36088,6 +36083,7 @@ extern "C" { str_: *const ::core::ffi::c_char, ) -> ::core::ffi::c_int; pub fn geterrcode() -> ::core::ffi::c_int; + pub fn geterrlevel() -> ::core::ffi::c_int; pub fn geterrposition() -> ::core::ffi::c_int; pub fn getinternalerrposition() -> ::core::ffi::c_int; pub fn errsave_start(context: *mut Node, domain: *const ::core::ffi::c_char) -> bool; @@ -50951,7 +50947,6 @@ extern "C" { pub fn generate_opclass_name(opclass: Oid) -> *mut ::core::ffi::c_char; pub fn get_range_partbound_string(bound_datums: *mut List) -> *mut ::core::ffi::c_char; pub fn pg_get_statisticsobjdef_string(statextid: Oid) -> *mut ::core::ffi::c_char; - pub fn get_list_partvalue_string(val: *mut Const) -> *mut ::core::ffi::c_char; pub fn sampler_random_init_state(seed: uint32, randstate: *mut pg_prng_state); pub fn sampler_random_fract(randstate: *mut pg_prng_state) -> f64; pub fn BlockSampler_Init( @@ -52223,18 +52218,14 @@ pub const AlterTableType_AT_DetachPartition: u32 = 61; note = "you want pg_sys::AlterTableType::AT_DetachPartitionFinalize" )] pub const AlterTableType_AT_DetachPartitionFinalize: u32 = 62; -#[deprecated(since = "0.12.0", note = "you want pg_sys::AlterTableType::AT_SplitPartition")] -pub const AlterTableType_AT_SplitPartition: u32 = 63; -#[deprecated(since = "0.12.0", note = "you want pg_sys::AlterTableType::AT_MergePartitions")] -pub const AlterTableType_AT_MergePartitions: u32 = 64; #[deprecated(since = "0.12.0", note = "you want pg_sys::AlterTableType::AT_AddIdentity")] -pub const AlterTableType_AT_AddIdentity: u32 = 65; +pub const AlterTableType_AT_AddIdentity: u32 = 63; #[deprecated(since = "0.12.0", note = "you want pg_sys::AlterTableType::AT_SetIdentity")] -pub const AlterTableType_AT_SetIdentity: u32 = 66; +pub const AlterTableType_AT_SetIdentity: u32 = 64; #[deprecated(since = "0.12.0", note = "you want pg_sys::AlterTableType::AT_DropIdentity")] -pub const AlterTableType_AT_DropIdentity: u32 = 67; +pub const AlterTableType_AT_DropIdentity: u32 = 65; #[deprecated(since = "0.12.0", note = "you want pg_sys::AlterTableType::AT_ReAddStatistics")] -pub const AlterTableType_AT_ReAddStatistics: u32 = 68; +pub const AlterTableType_AT_ReAddStatistics: u32 = 66; #[deprecated(since = "0.12.0", note = "you want pg_sys::ArchiveMode::ARCHIVE_MODE_OFF")] pub const ArchiveMode_ARCHIVE_MODE_OFF: u32 = 0; #[deprecated(since = "0.12.0", note = "you want pg_sys::ArchiveMode::ARCHIVE_MODE_ON")] diff --git a/pgrx-sql-entity-graph/Cargo.toml b/pgrx-sql-entity-graph/Cargo.toml index f047f0669..1c31b622b 100644 --- a/pgrx-sql-entity-graph/Cargo.toml +++ b/pgrx-sql-entity-graph/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "pgrx-sql-entity-graph" -version = "0.12.2" +version = "0.12.3" authors = ["PgCentral Foundation, Inc. "] license = "MIT" description = "Sql Entity Graph for `pgrx`" diff --git a/pgrx-tests/Cargo.toml b/pgrx-tests/Cargo.toml index 2b25c9728..3fd78f559 100644 --- a/pgrx-tests/Cargo.toml +++ b/pgrx-tests/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "pgrx-tests" -version = "0.12.2" +version = "0.12.3" authors = ["PgCentral Foundation, Inc. "] license = "MIT" description = "Test framework for 'pgrx'-based Postgres extensions" @@ -72,7 +72,7 @@ rand = "0.8.5" [dependencies.pgrx] # Not unified in workspace due to default-features key path = "../pgrx" default-features = false -version = "=0.12.2" +version = "=0.12.3" [dev-dependencies] eyre.workspace = true # testing functions that return `eyre::Result` diff --git a/pgrx/Cargo.toml b/pgrx/Cargo.toml index f41bbc81a..304e1ff55 100644 --- a/pgrx/Cargo.toml +++ b/pgrx/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "pgrx" -version = "0.12.2" +version = "0.12.3" authors = ["PgCentral Foundation, Inc. "] license = "MIT" description = "pgrx: A Rust framework for creating Postgres extensions"