From 0652d4d34effa363be48461c1953497011e17fa5 Mon Sep 17 00:00:00 2001 From: tomkv <23433734+tomkv@users.noreply.github.com> Date: Thu, 26 Jun 2025 14:17:38 +0200 Subject: [PATCH 1/5] make it buildable again; also with pg17 --- Cargo.toml | 14 ++++++++------ pg_regress/expected/setup.out | 3 +++ pg_regress/sql/setup.sql | 3 +++ pg_sqids.control | 3 ++- src/bin/pgrx_embed.rs | 1 + src/lib.rs | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 pg_regress/expected/setup.out create mode 100644 pg_regress/sql/setup.sql create mode 100644 src/bin/pgrx_embed.rs diff --git a/Cargo.toml b/Cargo.toml index dc0008a..593e0fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,11 @@ version = "0.1.0" edition = "2021" [lib] -crate-type = ["cdylib"] +crate-type = ["cdylib", "lib"] + +[[bin]] +name = "pgrx_embed_pg_sqids" +path = "./src/bin/pgrx_embed.rs" [features] default = ["pg13"] @@ -12,15 +16,16 @@ pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ] pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ] pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ] pg16 = ["pgrx/pg16", "pgrx-tests/pg16" ] +pg17 = ["pgrx/pg17", "pgrx-tests/pg17" ] pg_test = [] [dependencies] -pgrx = "0.13.1" +pgrx = "=0.14.3" sqids = "0.4.2" thiserror = "2.0.12" [dev-dependencies] -pgrx-tests = "0.13.1" +pgrx-tests = "=0.14.3" [profile.dev] panic = "unwind" @@ -30,6 +35,3 @@ panic = "unwind" opt-level = 3 lto = "fat" codegen-units = 1 - -[package.metadata.pgrx] -version = "0.1.0" diff --git a/pg_regress/expected/setup.out b/pg_regress/expected/setup.out new file mode 100644 index 0000000..400956c --- /dev/null +++ b/pg_regress/expected/setup.out @@ -0,0 +1,3 @@ +-- this setup file is run immediately after the regression database is (re)created +-- the file is optional but you likely want to create the extension +CREATE EXTENSION pg_sqids; diff --git a/pg_regress/sql/setup.sql b/pg_regress/sql/setup.sql new file mode 100644 index 0000000..400956c --- /dev/null +++ b/pg_regress/sql/setup.sql @@ -0,0 +1,3 @@ +-- this setup file is run immediately after the regression database is (re)created +-- the file is optional but you likely want to create the extension +CREATE EXTENSION pg_sqids; diff --git a/pg_sqids.control b/pg_sqids.control index 21b785b..2df5b5f 100644 --- a/pg_sqids.control +++ b/pg_sqids.control @@ -1,5 +1,6 @@ comment = 'pg_sqids: Created by pgrx' default_version = '@CARGO_VERSION@' -module_pathname = '$libdir/pg_sqids' +module_pathname = 'pg_sqids' relocatable = false superuser = true +trusted = false diff --git a/src/bin/pgrx_embed.rs b/src/bin/pgrx_embed.rs new file mode 100644 index 0000000..57483f1 --- /dev/null +++ b/src/bin/pgrx_embed.rs @@ -0,0 +1 @@ +::pgrx::pgrx_embed!(); \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index d58c6af..ae6647f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,7 +6,7 @@ use error::PgError; mod error; mod utils; -pgrx::pg_module_magic!(); +::pgrx::pg_module_magic!(); #[pg_extern(name = "sqids_encode")] fn sqids_encode(numbers: VariadicArray) -> Result { From f7a6295f67757eb81a4edf99afd89ac209faf796 Mon Sep 17 00:00:00 2001 From: tomkv <23433734+tomkv@users.noreply.github.com> Date: Thu, 26 Jun 2025 14:19:52 +0200 Subject: [PATCH 2/5] be specific about pgrx version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ce4557..d99b7e3 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Not good for: 1. Install [pgrx](https://github.com/pgcentralfoundation/pgrx?tab=readme-ov-file#getting-started): ```bash - cargo install --locked cargo-pgrx + cargo install --locked --version=0.14.3 cargo-pgrx ``` 1. Install dependencies and run psql session: From 4be7ccb54a94399118dedd06414d7bf139868f7c Mon Sep 17 00:00:00 2001 From: tomkv <23433734+tomkv@users.noreply.github.com> Date: Tue, 10 Feb 2026 18:36:24 +0100 Subject: [PATCH 3/5] add pg18, bump up pgrx, set as trusted --- Cargo.toml | 5 +++-- README.md | 2 +- pg_sqids.control | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 593e0fc..fd2abe1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,15 +17,16 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ] pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ] pg16 = ["pgrx/pg16", "pgrx-tests/pg16" ] pg17 = ["pgrx/pg17", "pgrx-tests/pg17" ] +pg18 = ["pgrx/pg18", "pgrx-tests/pg18" ] pg_test = [] [dependencies] -pgrx = "=0.14.3" +pgrx = "=0.17.0" sqids = "0.4.2" thiserror = "2.0.12" [dev-dependencies] -pgrx-tests = "=0.14.3" +pgrx-tests = "=0.17.0" [profile.dev] panic = "unwind" diff --git a/README.md b/README.md index d99b7e3..b3bb868 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Not good for: 1. Install [pgrx](https://github.com/pgcentralfoundation/pgrx?tab=readme-ov-file#getting-started): ```bash - cargo install --locked --version=0.14.3 cargo-pgrx + cargo install --locked --version=0.17.0 cargo-pgrx ``` 1. Install dependencies and run psql session: diff --git a/pg_sqids.control b/pg_sqids.control index 2df5b5f..2bbff6b 100644 --- a/pg_sqids.control +++ b/pg_sqids.control @@ -3,4 +3,4 @@ default_version = '@CARGO_VERSION@' module_pathname = 'pg_sqids' relocatable = false superuser = true -trusted = false +trusted = true From d7ec46306430a8112aa663bc844a40608d8adb27 Mon Sep 17 00:00:00 2001 From: tomkv <23433734+tomkv@users.noreply.github.com> Date: Tue, 9 Jun 2026 13:41:46 +0200 Subject: [PATCH 4/5] update pgrx dependency --- Cargo.toml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fd2abe1..5c0dc49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ pg18 = ["pgrx/pg18", "pgrx-tests/pg18" ] pg_test = [] [dependencies] -pgrx = "=0.17.0" +pgrx = "=0.18.1" sqids = "0.4.2" thiserror = "2.0.12" diff --git a/README.md b/README.md index b3bb868..d7e2bbd 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Not good for: 1. Install [pgrx](https://github.com/pgcentralfoundation/pgrx?tab=readme-ov-file#getting-started): ```bash - cargo install --locked --version=0.17.0 cargo-pgrx + cargo install --locked --version=0.18.1 cargo-pgrx ``` 1. Install dependencies and run psql session: From 488469df6c2cf0db79c18772fb8f032c2e3b4f5d Mon Sep 17 00:00:00 2001 From: tomkv <23433734+tomkv@users.noreply.github.com> Date: Tue, 9 Jun 2026 13:45:50 +0200 Subject: [PATCH 5/5] update pgrx-tests dependency --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5c0dc49..5f38a0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ sqids = "0.4.2" thiserror = "2.0.12" [dev-dependencies] -pgrx-tests = "=0.17.0" +pgrx-tests = "=0.18.1" [profile.dev] panic = "unwind"