feat(wrappers): support more versions (#1831)

* feat(wrappers): add versions 0.4.5, 0.4.6, and 0.5.0

* feat(wrappers): add versions 0.4.3, 0.4.4, 0.5.5

* feat(wrappers): add versions 0.3.0, 0.4.1, 0.4.2

* chore: add release suffix for testing

* chore: bump version for release

---------

Co-authored-by: Sam Rose <[email protected]>

Author: jfroche

ansible/vars.yml

@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.5.1.045-orioledb"
-  postgres17: "17.6.1.024"
-  postgres15: "15.14.1.024"
+  postgresorioledb-17: "17.5.1.046-orioledb"
+  postgres17: "17.6.1.025"
+  postgres15: "15.14.1.025"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0

nix/cargo-pgrx/versions.json

@@ -99,5 +99,14 @@
         "cargoHash": "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk="
       }
     }
+  },
+  "0.16.0": {
+    "hash": "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=",
+    "rust": {
+      "1.87.0": {
+        "cargoHash": "sha256-pK6OxRNubcWhohLvIJIliRtaHSIQOhQp7Q9brPygZYA="
+      }
+    }
   }
+
 }

nix/ext/versions.json

@@ -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",
@@ -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"
     }
   }
 }

nix/ext/wrappers/default.nix

@@ -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=";
@@ -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"
@@ -214,6 +211,7 @@ buildEnv {
     "/share/postgresql/extension"
   ];
   postBuild = ''
+
     create_control_files() {
       # Create main control file pointing to latest version
       {
@@ -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
@@ -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)
     }")