diff --git a/Cargo.toml b/Cargo.toml index dc0008a..fd2abe1 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,17 @@ 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" ] +pg18 = ["pgrx/pg18", "pgrx-tests/pg18" ] pg_test = [] [dependencies] -pgrx = "0.13.1" +pgrx = "=0.17.0" sqids = "0.4.2" thiserror = "2.0.12" [dev-dependencies] -pgrx-tests = "0.13.1" +pgrx-tests = "=0.17.0" [profile.dev] panic = "unwind" @@ -30,6 +36,3 @@ panic = "unwind" opt-level = 3 lto = "fat" codegen-units = 1 - -[package.metadata.pgrx] -version = "0.1.0" diff --git a/README.md b/README.md index 1ce4557..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 cargo-pgrx + cargo install --locked --version=0.17.0 cargo-pgrx ``` 1. Install dependencies and run psql session: 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..2bbff6b 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 = true 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 {