From ea0b139f873b8e1d71744ffece0150adbd21e882 Mon Sep 17 00:00:00 2001 From: Alex Groleau Date: Tue, 8 Jul 2025 07:27:05 -0400 Subject: [PATCH] upgraded rust and pgrx versions --- Cargo.lock | 49 +++++++++++++++++++++++++++++++++++-------------- Cargo.toml | 6 +++--- flow | 6 +++--- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a8842a..aab4ade 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -362,6 +362,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" @@ -418,6 +427,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" @@ -1106,9 +1124,9 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e1b41219b12cfcaa5d58f946a7ff1e7ddf0a4f7f930a7cdab612916e8a12c64" +checksum = "bab5bc1d60d3bc3c966d307a3c7313b1ebfb49a0ec183be3f1a057df0bcc9988" dependencies = [ "atomic-traits", "bitflags", @@ -1130,9 +1148,9 @@ dependencies = [ [[package]] name = "pgrx-bindgen" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcef51e801bb18662716f1c524cedfb7943844593171734fe4d3a94c9afa12" +checksum = "9804b74c211a9edd550cd974718f8cc407dec50d8e9cafb906e0b042ba434af0" dependencies = [ "bindgen", "cc", @@ -1149,9 +1167,9 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729af3e6954d2f76230d700efd8606121f13f71f800e5c76173add2c02097948" +checksum = "f230769493bf567f137de23264d604d267dd72b8a77c596528e43cf423c6208e" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", @@ -1161,11 +1179,13 @@ dependencies = [ [[package]] name = "pgrx-pg-config" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "116e33a329f3fac976b5f3150f14f2612735dfc56a15cb0a0800f25a3bd90aa7" +checksum = "49b64c071c2a46a19ab4521120a25b02b598f4abf6e9b4b1769a7922edeee3de" dependencies = [ "cargo_toml", + "codepage", + "encoding_rs", "eyre", "home", "owo-colors", @@ -1175,13 +1195,14 @@ dependencies = [ "thiserror 2.0.12", "toml", "url", + "winapi", ] [[package]] name = "pgrx-pg-sys" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd074044513f1f7fc63fd1ed0117ad0fbe690ef1b445f6d72b92e611b3846490" +checksum = "fcbfa98ec7a90252d13a78ac666541173dbb01a2fc1ba20131db6490c0711125" dependencies = [ "cee-scape", "libc", @@ -1194,9 +1215,9 @@ dependencies = [ [[package]] name = "pgrx-sql-entity-graph" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0eb73c4b916d4abb422fff66c2606c46bf4b99136209306836e89766a8d49cd" +checksum = "e79bbf5a33cff6cfdc6dda3a976cd931c995eaa2c073a7c59b8f8fe8f6faa073" dependencies = [ "convert_case", "eyre", @@ -1210,9 +1231,9 @@ dependencies = [ [[package]] name = "pgrx-tests" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba4e9a97fd148c9f65cf0c56d33a4cde4deb9941f5c0d914a39148e8148a7a6" +checksum = "9791c709882f3af9545bcca71670fdd82768f67a428b416b6210eae3773dbd0d" dependencies = [ "clap-cargo", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 3869d12..1d6e2ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "jspg" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] -pgrx = "0.14.0" +pgrx = "0.15.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" lazy_static = "1.5.0" boon = "0.6.1" [dev-dependencies] -pgrx-tests = "0.14.0" +pgrx-tests = "0.15.0" [lib] crate-type = ["cdylib", "lib"] diff --git a/flow b/flow index 232802a..212881e 100755 --- a/flow +++ b/flow @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Flows source ./flows/base @@ -11,7 +11,7 @@ source ./flows/rust POSTGRES_VERSION="17" POSTGRES_CONFIG_PATH="/opt/homebrew/opt/postgresql@${POSTGRES_VERSION}/bin/pg_config" DEPENDENCIES+=(icu4c pkg-config "postgresql@${POSTGRES_VERSION}") -CARGO_DEPENDENCIES=(cargo-pgrx==0.14.0) +CARGO_DEPENDENCIES=(cargo-pgrx==0.15.0) GITEA_ORGANIZATION="cellular" GITEA_REPOSITORY="jspg" @@ -129,4 +129,4 @@ jspg-flow() { register-flow "jspg-usage" "jspg-flow" -dispatch "$@" +dispatch "$@" \ No newline at end of file