From 14d420d06370a842da719aa21487118d2716ccf0 Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Mon, 27 Oct 2025 14:07:23 +0800 Subject: [PATCH 1/3] bump pgrx to 0.16.1 with pg18 support --- Cargo.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6a0e55a..0ef74bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,15 +14,14 @@ pg14 = ["pgrx/pg14"] pg15 = ["pgrx/pg15"] pg16 = ["pgrx/pg16"] pg17 = ["pgrx/pg17"] +pg18 = ["pgrx/pg18"] pg_test = [] [dependencies] -pgrx = "0.14.1" -pgrx-macros = "=0.14.1" - +pgrx = "0.16.1" [dev-dependencies] -pgrx-tests = "0.14.1" +pgrx-tests = "0.16.1" [profile.dev] From 11d4d088d3234ee8e6bb3c9a08aabe0b52c4f8cc Mon Sep 17 00:00:00 2001 From: Ryan Lambert Date: Fri, 5 Dec 2025 07:32:07 -0700 Subject: [PATCH 2/3] Additional adjustments to add Pg18 support and remove Pg13 support. --- .cargo/{config => config.toml} | 0 Cargo.toml | 5 ++--- build/build.sh | 4 ++-- src/lib.rs | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) rename .cargo/{config => config.toml} (100%) diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/Cargo.toml b/Cargo.toml index 0ef74bd..30d3554 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,14 @@ [package] name = "pgdd" version = "0.6.0" -edition = "2021" +edition = "2024" description = "In-database (PostgreSQL) data dictionary providing database introspection via standard SQL query syntax." [lib] crate-type = ["cdylib", "lib"] [features] -default = ["pg17"] -pg13 = ["pgrx/pg13"] +default = ["pg18"] pg14 = ["pgrx/pg14"] pg15 = ["pgrx/pg15"] pg16 = ["pgrx/pg16"] diff --git a/build/build.sh b/build/build.sh index 3570376..d9316b7 100755 --- a/build/build.sh +++ b/build/build.sh @@ -21,9 +21,9 @@ BASE=$(dirname `pwd`) VERSION=$(cat $BASE/pgdd.control | grep default_version | cut -f2 -d\') LOGDIR=${BASE}/target/logs ARTIFACTDIR=${BASE}/target/artifacts -PGRXVERSION=0.14.1 +PGRXVERSION=0.16.1 -PG_VERS=("pg13" "pg14" "pg15" "pg16" "pg17") +PG_VERS=("pg14" "pg15" "pg16" "pg17" "pg18") #PG_VERS=("pg17") echo $BASE diff --git a/src/lib.rs b/src/lib.rs index 23d97f9..9755c2a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,8 +18,8 @@ extension_sql_file!("sql/load_default_data.sql", ); -// Using a feature flag to enable for all current version as a reminder to self we can do this. -#[cfg(any(feature="pg13", feature="pg14", feature="pg15", feature="pg16", feature="pg17"))] +// Example of feature flag to enable specific versions as a reminder to self we can do this. +//#[cfg(any(feature="pg14", feature="pg15", feature="pg16", feature="pg17", feature="pg18"))] extension_sql_file!("sql/function_query/columns_12.sql", requires = ["create_extension_tables_all"] ); From 71b3689860280505a5553c12123ce3e494dbe999 Mon Sep 17 00:00:00 2001 From: Ryan Lambert Date: Fri, 5 Dec 2025 07:58:49 -0700 Subject: [PATCH 3/3] More updates through build system. Bumping version. --- Cargo.toml | 2 +- build/build.sh | 2 +- build/docker/pgdd-debian-postgis/Dockerfile | 2 +- build/docker/pgdd-ubuntu-jammy/Dockerfile | 2 +- build/docker/pgdd-ubuntu-noble/Dockerfile | 2 +- pgdd.control | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 30d3554..77c8205 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgdd" -version = "0.6.0" +version = "0.6.1" edition = "2024" description = "In-database (PostgreSQL) data dictionary providing database introspection via standard SQL query syntax." diff --git a/build/build.sh b/build/build.sh index d9316b7..f47d2ac 100755 --- a/build/build.sh +++ b/build/build.sh @@ -24,7 +24,7 @@ ARTIFACTDIR=${BASE}/target/artifacts PGRXVERSION=0.16.1 PG_VERS=("pg14" "pg15" "pg16" "pg17" "pg18") -#PG_VERS=("pg17") +#PG_VERS=("pg18") echo $BASE echo $VERSION diff --git a/build/docker/pgdd-debian-postgis/Dockerfile b/build/docker/pgdd-debian-postgis/Dockerfile index ce787d4..b01dda8 100644 --- a/build/docker/pgdd-debian-postgis/Dockerfile +++ b/build/docker/pgdd-debian-postgis/Dockerfile @@ -27,11 +27,11 @@ RUN apt-get install -y --fix-missing \ libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \ libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \ ruby ruby-dev rubygems \ - postgresql-13 postgresql-server-dev-13 \ postgresql-14 postgresql-server-dev-14 \ postgresql-15 postgresql-server-dev-15 \ postgresql-16 postgresql-server-dev-16 \ postgresql-17 postgresql-server-dev-17 \ + postgresql-18 postgresql-server-dev-18 \ && apt autoremove -y diff --git a/build/docker/pgdd-ubuntu-jammy/Dockerfile b/build/docker/pgdd-ubuntu-jammy/Dockerfile index 30067e8..6c9f9e1 100644 --- a/build/docker/pgdd-ubuntu-jammy/Dockerfile +++ b/build/docker/pgdd-ubuntu-jammy/Dockerfile @@ -27,11 +27,11 @@ RUN apt-get install -y --fix-missing \ libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \ libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \ ruby ruby-dev rubygems \ - postgresql-13 postgresql-server-dev-13 \ postgresql-14 postgresql-server-dev-14 \ postgresql-15 postgresql-server-dev-15 \ postgresql-16 postgresql-server-dev-16 \ postgresql-17 postgresql-server-dev-17 \ + postgresql-18 postgresql-server-dev-18 \ && apt autoremove -y diff --git a/build/docker/pgdd-ubuntu-noble/Dockerfile b/build/docker/pgdd-ubuntu-noble/Dockerfile index 4078237..5649b9b 100644 --- a/build/docker/pgdd-ubuntu-noble/Dockerfile +++ b/build/docker/pgdd-ubuntu-noble/Dockerfile @@ -28,11 +28,11 @@ RUN apt-get install -y --fix-missing \ libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \ libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \ ruby ruby-dev rubygems \ - postgresql-13 postgresql-server-dev-13 \ postgresql-14 postgresql-server-dev-14 \ postgresql-15 postgresql-server-dev-15 \ postgresql-16 postgresql-server-dev-16 \ postgresql-17 postgresql-server-dev-17 \ + postgresql-18 postgresql-server-dev-18 \ && apt autoremove -y diff --git a/pgdd.control b/pgdd.control index 5c033c7..e981ffe 100644 --- a/pgdd.control +++ b/pgdd.control @@ -1,5 +1,5 @@ comment = 'An in-database data dictionary providing database introspection via standard SQL query syntax. Developed using pgx (https://github.com/pgcentralfoundation/pgrx).' -default_version = '0.6.0' +default_version = '0.6.1' module_pathname = '$libdir/pgdd' relocatable = false schema = dd