Skip to content

feat(wrappers): support more versions #1831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+114 −17
Open

feat(wrappers): support more versions #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e40a8e1
feat(wrappers): add versions 0.4.5, 0.4.6, and 0.5.0
jfroche Oct 9, 2025
b980d07
feat(wrappers): add versions 0.4.3, 0.4.4, 0.5.5
jfroche Oct 9, 2025
fd7cbf5
feat(wrappers): add versions 0.3.0, 0.4.1, 0.4.2
jfroche Oct 10, 2025
ca5ccd3
chore: add release suffix for testing
jfroche Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: "17.5.1.041-orioledb"
postgres17: "17.6.1.020"
postgres15: "15.14.1.020"
postgresorioledb-17: "17.5.1.041-orioledb-more-wrappers"
postgres17: "17.6.1.020-more-wrappers"
postgres15: "15.14.1.020-more-wrappers"

# Non Postgres Extensions
pgbouncer_release: 1.19.0
Expand Down
9 changes: 9 additions & 0 deletions nix/cargo-pgrx/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,14 @@
"cargoHash": "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk="
}
}
},
"0.16.0": {
"hash": "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=",
"rust": {
"1.87.0": {
"cargoHash": "sha256-pK6OxRNubcWhohLvIJIliRtaHSIQOhQp7Q9brPygZYA="
}
}
}

}
78 changes: 78 additions & 0 deletions nix/ext/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,74 @@
}
},
"wrappers": {
"0.3.0": {
"postgresql": [
"15"
],
"hash": "sha256-ogpF8NJ7kW3Ut8jaKMDiKYIXnI38nfRq2mMK4rqFAIA=",
"pgrx": "0.11.3",
"rust": "1.76.0"
},
"0.4.1": {
"postgresql": [
"15"
],
"hash": "sha256-AU9Y43qEMcIBVBThu+Aor1HCtfFIg+CdkzK9IxVdkzM=",
"pgrx": "0.11.3",
"rust": "1.76.0"
},
"0.4.2": {
"postgresql": [
"15"
],
"hash": "sha256-ut3IQED6ANXgabiHoEUdfSrwkuuYYSpRoeWdtBvSe64=",
"pgrx": "0.11.3",
"rust": "1.76.0"
},
"0.4.3": {
"postgresql": [
"15"
],
"hash": "sha256-CkoNMoh40zbQL4V49ZNYgv3JjoNWjODtTpHn+L8DdZA=",
"pgrx": "0.12.6",
"rust": "1.80.0"
},
"0.4.4": {
"postgresql": [
"15",
"17"
],
"hash": "sha256-QoGFJpq8PuvMM8SS+VZd7MlNl56uFivRjs1tCtwX+oE=",
"pgrx": "0.12.6",
"rust": "1.80.0"
},
"0.4.5": {
"postgresql": [
"15",
"17"
],
"hash": "sha256-IgDfVFROMCHYLZ/Iqj12MsQjPPCdRoH+3oi3Ki/iaRI=",
"pgrx": "0.12.9",
"rust": "1.81.0"
},
"0.4.6": {
"postgresql": [
"15",
"17"
],
"hash": "sha256-hthb3qEXT1Kf4yPoq0udEbQzlyLtI5tug6sK4YAPFjU=",
"pgrx": "0.12.9",
"rust": "1.84.0"
},
"0.5.0": {
"postgresql": [
"15",
"17"
],
"hash": "sha256-FbRTUcpEHBa5DI6dutvBeahYM0RZVAXIzIAZWIaxvn0=",
"pgrx": "0.12.9",
"rust": "1.84.0"
},
"0.5.4": {
"postgresql": [
"15",
Expand All @@ -480,6 +548,16 @@
"hash": "sha256-W1RokXH4Vfj2FIuEzGEP5SzzWsv2Pbzfa816nXKnSoc=",
"pgrx": "0.14.3",
"rust": "1.87.0"
},
"0.5.5": {
"postgresql": [
"15",
"17",
"orioledb-17"
],
"hash": "sha256-tWa1XewJbbqarwWkJPfvCIev7Fn0hLJRzYiz0vuebyA=",
"pgrx": "0.16.0",
"rust": "1.87.0"
}
}
}
38 changes: 24 additions & 14 deletions nix/ext/wrappers/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ let
"clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o=";
"iceberg-catalog-s3tables-0.5.1" = "sha256-1JkB2JExukABlbW1lZPolNQCYb9URi8xNYY3APmiGq0=";
}
else if builtins.compareVersions "0.5.4" version == 0 then
{
"clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o=";
"iceberg-catalog-s3tables-0.5.1" = "sha256-1JkB2JExukABlbW1lZPolNQCYb9URi8xNYY3APmiGq0=";
}
else if builtins.compareVersions "0.5.5" version == 0 then
{
"clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o=";
"iceberg-catalog-s3tables-0.6.0" = "sha256-AUK7B0wMqQZwJho91woLs8uOC4k1RdUEEN5Khw2OoqQ=";
}
else
{
"clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o=";
Expand Down Expand Up @@ -162,19 +172,6 @@ let
}
);
previouslyPackagedVersions = [
"0.5.3"
"0.5.2"
"0.5.1"
"0.5.0"
"0.4.6"
"0.4.5"
"0.4.4"
"0.4.3"
"0.4.2"
"0.4.1"
"0.4.0"
"0.3.1"
"0.3.0"
"0.2.0"
"0.1.19"
"0.1.18"
Expand Down Expand Up @@ -214,6 +211,7 @@ buildEnv {
"/share/postgresql/extension"
];
postBuild = ''

create_control_files() {
# Create main control file pointing to latest version
{
Expand All @@ -233,6 +231,19 @@ buildEnv {
}

create_migration_sql_files() {
PREVIOUS_VERSION=""
while IFS= read -r i; do
FILENAME=$(basename "$i")
DIRNAME=$(dirname "$i")
VERSION="$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+' <<< $FILENAME)"
if [[ "$PREVIOUS_VERSION" != "" ]]; then
echo "Processing $i"
MIGRATION_FILENAME="$DIRNAME/''${FILENAME/$VERSION/$PREVIOUS_VERSION--$VERSION}"
cp "$i" "$MIGRATION_FILENAME"
fi
PREVIOUS_VERSION="$VERSION"
done < <(find $out -name '*.sql' | sort -V)

# Create migration SQL files from previous versions to newer versions
for prev_version in ${lib.concatStringsSep " " previouslyPackagedVersions}; do
for curr_version in ${lib.concatStringsSep " " versions}; do
Expand All @@ -252,7 +263,6 @@ buildEnv {
create_lib_files
create_migration_sql_files

# checks
(test "$(ls -A $out/lib/${pname}*${postgresql.dlSuffix} | wc -l)" = "${
toString (numberOfVersions + numberOfPreviouslyPackagedVersions + 1)
}")
Expand Down