diff --git a/.github/workflows/base-pkg-image.yml b/.github/workflows/base-pkg-image.yml index 2d7a53b4..b6e42d18 100644 --- a/.github/workflows/base-pkg-image.yml +++ b/.github/workflows/base-pkg-image.yml @@ -9,7 +9,7 @@ on: cargo-pgrx-version: required: false type: string - default: "0.14.1" + default: "0.15.0" description: | version of cargo-pgrx to download (inside image build) diff --git a/.github/workflows/build-and-test/action.yaml b/.github/workflows/build-and-test/action.yaml index 90fb83ac..fc0fc190 100644 --- a/.github/workflows/build-and-test/action.yaml +++ b/.github/workflows/build-and-test/action.yaml @@ -38,9 +38,9 @@ inputs: default: idkit cargo-pgrx-version: type: string - default: 0.14.1 + default: 0.15.0 decription: | - cargo-pgrx version (ex. '0.14.1') + cargo-pgrx version (ex. '0.15.0') pgrx-pg-version: type: string default: pg17 diff --git a/.github/workflows/build-rpm/action.yaml b/.github/workflows/build-rpm/action.yaml index 797e162f..939dc6fb 100644 --- a/.github/workflows/build-rpm/action.yaml +++ b/.github/workflows/build-rpm/action.yaml @@ -33,9 +33,9 @@ inputs: Postgres version (ex. '17.5') cargo-pgrx-version: type: string - default: 0.14.1 + default: 0.15.0 decription: | - cargo-pgrx version (ex. '0.14.1) + cargo-pgrx version (ex. '0.15.0') user: type: string default: runner diff --git a/.github/workflows/ci-builder-image.yml b/.github/workflows/ci-builder-image.yml index 2281ea37..68cdd1db 100644 --- a/.github/workflows/ci-builder-image.yml +++ b/.github/workflows/ci-builder-image.yml @@ -9,7 +9,7 @@ on: cargo-pgrx-version: required: false type: string - default: "0.14.1" + default: "0.15.0" description: | version of cargo-pgrx to download (inside image build) diff --git a/Cargo.lock b/Cargo.lock index 72913ea0..c5a84558 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -387,6 +387,15 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +[[package]] +name = "codepage" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48f68d061bc2828ae826206326e61251aca94c1e4a5305cf52d9138639c918b4" +dependencies = [ + "encoding_rs", +] + [[package]] name = "convert_case" version = "0.8.0" @@ -509,6 +518,15 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enum-map" version = "2.7.3" @@ -1339,9 +1357,9 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5a7f1a5bac3a76a4fa056655eb80e394c5216717bf4673c99d9d10583e960d" +checksum = "bab5bc1d60d3bc3c966d307a3c7313b1ebfb49a0ec183be3f1a057df0bcc9988" dependencies = [ "atomic-traits", "bitflags 2.9.1", @@ -1363,9 +1381,9 @@ dependencies = [ [[package]] name = "pgrx-bindgen" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e1a6df74e60ac82d6ad52f8a2a85e5d7004f9dfc7c52c94d461d9193aafa0b" +checksum = "9804b74c211a9edd550cd974718f8cc407dec50d8e9cafb906e0b042ba434af0" dependencies = [ "bindgen", "cc", @@ -1382,9 +1400,9 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868ae3cb1762dcca0e236d4b5368315d4f377acbfff31d8fad9f47394d2e4bcd" +checksum = "f230769493bf567f137de23264d604d267dd72b8a77c596528e43cf423c6208e" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", @@ -1394,11 +1412,13 @@ dependencies = [ [[package]] name = "pgrx-pg-config" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421be70840655a502381d4ac84b263da83c6714018e27bfdcd7c48f32ff60ef6" +checksum = "49b64c071c2a46a19ab4521120a25b02b598f4abf6e9b4b1769a7922edeee3de" dependencies = [ "cargo_toml", + "codepage", + "encoding_rs", "eyre", "home", "owo-colors", @@ -1408,13 +1428,14 @@ dependencies = [ "thiserror 2.0.12", "toml", "url", + "winapi", ] [[package]] name = "pgrx-pg-sys" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c844a49ee575cf4bd3340c483e49160a99b1bd8c5fd2e87fc7a9231566cb07f2" +checksum = "fcbfa98ec7a90252d13a78ac666541173dbb01a2fc1ba20131db6490c0711125" dependencies = [ "cee-scape", "libc", @@ -1427,9 +1448,9 @@ dependencies = [ [[package]] name = "pgrx-sql-entity-graph" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391595ab6d13f65728bdd691fdd58e69bb31f1f092886ed0a11c838de1d01ae9" +checksum = "e79bbf5a33cff6cfdc6dda3a976cd931c995eaa2c073a7c59b8f8fe8f6faa073" dependencies = [ "convert_case", "eyre", @@ -1443,9 +1464,9 @@ dependencies = [ [[package]] name = "pgrx-tests" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c526ae1a3c5cdf10fb4a4a7179759d557da1724b38bcfee3f1d0d8fb5fd67509" +checksum = "9791c709882f3af9545bcca71670fdd82768f67a428b416b6210eae3773dbd0d" dependencies = [ "clap-cargo", "eyre", diff --git a/Cargo.toml b/Cargo.toml index be0c5be9..e68bb17a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ getrandom = { version = "0.2" } chrono = { version = "0.4", default-features = false, features = ["clock"] } svix-ksuid = { version = "0.8" } nanoid = { version = "0.4" } -pgrx = { version = "=0.14.1" } +pgrx = { version = "=0.15.0" } pushid = { version = "0.0.1" } timeflake-rs = { version = "0.3" } ulid = { version = "1.2", features = [ "uuid" ] } @@ -44,7 +44,7 @@ xid = { version = "1.1" } time = { version = "0.3" } [dev-dependencies] -pgrx-tests = { version = "=0.14.1" } +pgrx-tests = { version = "=0.15.0" } [profile.dev] panic = "unwind" diff --git a/Justfile b/Justfile index 8ce4c540..899c627d 100644 --- a/Justfile +++ b/Justfile @@ -241,7 +241,7 @@ builder_image_name := env_var_or_default("BUILDER_IMAGE_NAME", "ghcr.io/vadoswar builder_image_tag := env_var_or_default("BUILDER_IMAGE_TAG", "0.1.x") builder_image_name_full := env_var_or_default("BUILDER_IMAGE_NAME_FULL", builder_image_name + ":" + builder_image_tag) -builder_image_arg_cargo_pgrx_version := env_var_or_default("BUILDER_IMAGE_ARG_CARGO_PGRX_VERSION", "0.14.1") +builder_image_arg_cargo_pgrx_version := env_var_or_default("BUILDER_IMAGE_ARG_CARGO_PGRX_VERSION", "0.15.0") # Build the docker image used in BUILDER [group('package')] diff --git a/docs/local-development.md b/docs/local-development.md index 0578af22..ea44401c 100644 --- a/docs/local-development.md +++ b/docs/local-development.md @@ -30,7 +30,7 @@ The PGRX project is the magic behind this extension, exposing an easy-to-program To install it: ```console -cargo install --locked cargo-pgrx@0.14.1 +cargo install --locked cargo-pgrx@0.15.0 cargo pgrx init ``` diff --git a/infra/docker/base-pkg-alpine3.21.3-amd64.Dockerfile b/infra/docker/base-pkg-alpine3.21.3-amd64.Dockerfile index 0a443e4c..784d9a7b 100644 --- a/infra/docker/base-pkg-alpine3.21.3-amd64.Dockerfile +++ b/infra/docker/base-pkg-alpine3.21.3-amd64.Dockerfile @@ -41,7 +41,7 @@ RUN cargo install just cargo-get # Install pgrx # (disabling the static C runtime is required since pgrx requires dynamic linking w/ libssl and libcrypto) -RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo install --locked cargo-pgrx@0.14.1 +RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo install --locked cargo-pgrx@0.15.0 # Copy in pg_idkit code WORKDIR /pg_idkit diff --git a/infra/docker/builder-gnu.Dockerfile b/infra/docker/builder-gnu.Dockerfile index b0777562..b3eec565 100644 --- a/infra/docker/builder-gnu.Dockerfile +++ b/infra/docker/builder-gnu.Dockerfile @@ -1,7 +1,7 @@ # rust:1.85.1-slim-bullseye as of 2025/03/27 FROM rust:1.85.1-slim-bullseye@sha256:1eca9af45f393ac4669b9b63659529638359575f6268cbd4e6543ddc46c53803 -ARG CARGO_PGRX_VERSION=0.14.1 +ARG CARGO_PGRX_VERSION=0.15.0 ENV CARGO_PGRX_VERSION=${CARGO_PGRX_VERSION} # Install deps diff --git a/infra/docker/builder-musl.Dockerfile b/infra/docker/builder-musl.Dockerfile index 6df6d801..651b2620 100644 --- a/infra/docker/builder-musl.Dockerfile +++ b/infra/docker/builder-musl.Dockerfile @@ -1,7 +1,7 @@ # rust:1.85.1-alpine3.21 as of 2025/03/31 FROM rust:1.85.1-alpine3.21@sha256:4333721398de61f53ccbe53b0b855bcc4bb49e55828e8f652d7a8ac33dd0c118 -ARG CARGO_PGRX_VERSION=0.14.1 +ARG CARGO_PGRX_VERSION=0.15.0 ENV CARGO_PGRX_VERSION=${CARGO_PGRX_VERSION} RUN apk add --no-cache musl-dev openssl-dev perl make