fix(ext/wrappers): restore backward compatibility files for postgres upgrade

jfroche · soedirgo · commit e1ac8804019e · 2025-08-04T19:48:26.000+09:00
Postgres upgrade is failing due to missing files in the wrappers. Refactor extension build to move file creation from individual builds to the final buildEnv stage, ensuring all version-specific library symlinks and migration SQL files are properly included for postgres upgrades. <details> <summary>Files present in the extension before upgrading the extension</summary> ```bash $ nix build -L github:supabase/postgres/4db4d5b94269398dc167fe96ea43fc4336bff8b5\#packages.x86_64-linux.psql_15/exts/supabase-wrappers $ tree result result/ ├── lib │ ├── wrappers-0.1.0.so -> wrappers.so │ ├── wrappers-0.1.10.so -> wrappers.so │ ├── wrappers-0.1.11.so -> wrappers.so │ ├── wrappers-0.1.12.so -> wrappers.so │ ├── wrappers-0.1.14.so -> wrappers.so │ ├── wrappers-0.1.15.so -> wrappers.so │ ├── wrappers-0.1.16.so -> wrappers.so │ ├── wrappers-0.1.17.so -> wrappers.so │ ├── wrappers-0.1.18.so -> wrappers.so │ ├── wrappers-0.1.19.so -> wrappers.so │ ├── wrappers-0.1.1.so -> wrappers.so │ ├── wrappers-0.1.4.so -> wrappers.so │ ├── wrappers-0.1.5.so -> wrappers.so │ ├── wrappers-0.1.6.so -> wrappers.so │ ├── wrappers-0.1.7.so -> wrappers.so │ ├── wrappers-0.1.8.so -> wrappers.so │ ├── wrappers-0.1.9.so -> wrappers.so │ ├── wrappers-0.2.0.so -> wrappers.so │ ├── wrappers-0.3.0.so -> wrappers.so │ ├── wrappers-0.3.1.so -> wrappers.so │ ├── wrappers-0.4.0.so -> wrappers.so │ ├── wrappers-0.4.1.so -> wrappers.so │ ├── wrappers-0.4.2.so -> wrappers.so │ ├── wrappers-0.4.3.so -> wrappers.so │ ├── wrappers-0.4.4.so -> wrappers.so │ ├── wrappers-0.4.5.so -> wrappers.so │ ├── wrappers-0.4.6.so -> wrappers.so │ ├── wrappers-0.5.0.so -> wrappers.so │ └── wrappers.so └── share └── postgresql └── extension ├── wrappers--0.1.0--0.5.0.sql ├── wrappers--0.1.10--0.5.0.sql ├── wrappers--0.1.1--0.5.0.sql ├── wrappers--0.1.11--0.5.0.sql ├── wrappers--0.1.12--0.5.0.sql ├── wrappers--0.1.14--0.5.0.sql ├── wrappers--0.1.15--0.5.0.sql ├── wrappers--0.1.16--0.5.0.sql ├── wrappers--0.1.17--0.5.0.sql ├── wrappers--0.1.18--0.5.0.sql ├── wrappers--0.1.19--0.5.0.sql ├── wrappers--0.1.4--0.5.0.sql ├── wrappers--0.1.5--0.5.0.sql ├── wrappers--0.1.6--0.5.0.sql ├── wrappers--0.1.7--0.5.0.sql ├── wrappers--0.1.8--0.5.0.sql ├── wrappers--0.1.9--0.5.0.sql ├── wrappers--0.2.0--0.5.0.sql ├── wrappers--0.3.0--0.5.0.sql ├── wrappers--0.3.1--0.5.0.sql ├── wrappers--0.4.0--0.5.0.sql ├── wrappers--0.4.1--0.5.0.sql ├── wrappers--0.4.2--0.5.0.sql ├── wrappers--0.4.3--0.5.0.sql ├── wrappers--0.4.4--0.5.0.sql ├── wrappers--0.4.5--0.5.0.sql ├── wrappers--0.4.6--0.5.0.sql ├── wrappers--0.5.0.sql └── wrappers.control 5 directories, 58 files ``` </details> <details> <summary>Files present in the extension after upgrading the extension (after #1663 was merged)</summary> ```bash $ nix build -L github:supabase/postgres/develop\#packages.x86_64-linux.psql_15/exts/wrappers-all $ tree result result/ ├── lib │ ├── wrappers-0.5.3.so -> /nix/store/g84xfq2m4wrxwsrh63yrs4df44bwj52b-wrappers-0.5.3/lib/wrappers-0.5.3.so │ └── wrappers.so -> /nix/store/g84xfq2m4wrxwsrh63yrs4df44bwj52b-wrappers-0.5.3/lib/wrappers.so └── share └── postgresql └── extension ├── wrappers--0.5.3.control -> /nix/store/g84xfq2m4wrxwsrh63yrs4df44bwj52b-wrappers-0.5.3/share/postgresql/extension/wrappers--0.5.3.control ├── wrappers--0.5.3.sql -> /nix/store/g84xfq2m4wrxwsrh63yrs4df44bwj52b-wrappers-0.5.3/share/postgresql/extension/wrappers--0.5.3.sql └── wrappers.control -> /nix/store/g84xfq2m4wrxwsrh63yrs4df44bwj52b-wrappers-0.5.3/share/postgresql/extension/wrappers.control 5 directories, 5 files ``` </details> <details> <summary>Files present in the extension with this commit</summary> ```bash $ nix build -L .\#packages.x86_64-linux.psql_15/exts/wrappers-all $ tree result result/ ├── lib │ ├── wrappers-0.1.0.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.10.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.11.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.12.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.14.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.15.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.16.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.17.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.18.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.19.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.1.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.4.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.5.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.6.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.7.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.8.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.1.9.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.2.0.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.3.0.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.3.1.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.4.0.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.4.1.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.4.2.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.4.3.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.4.4.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.4.5.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.4.6.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.5.0.so -> /nix/store/w6yr0d0v8hxm32z1lh3p4m09gayli1sh-wrappers/lib/wrappers.so │ ├── wrappers-0.5.3.so -> /nix/store/m15jazn3jznd17naihs4w413r2wdwzpz-wrappers-0.5.3/lib/wrappers-0.5.3.so │ └── wrappers.so -> wrappers-0.5.3.so └── share └── postgresql └── extension ├── wrappers--0.1.0--0.5.3.sql ├── wrappers--0.1.10--0.5.3.sql ├── wrappers--0.1.1--0.5.3.sql ├── wrappers--0.1.11--0.5.3.sql ├── wrappers--0.1.12--0.5.3.sql ├── wrappers--0.1.14--0.5.3.sql ├── wrappers--0.1.15--0.5.3.sql ├── wrappers--0.1.16--0.5.3.sql ├── wrappers--0.1.17--0.5.3.sql ├── wrappers--0.1.18--0.5.3.sql ├── wrappers--0.1.19--0.5.3.sql ├── wrappers--0.1.4--0.5.3.sql ├── wrappers--0.1.5--0.5.3.sql ├── wrappers--0.1.6--0.5.3.sql ├── wrappers--0.1.7--0.5.3.sql ├── wrappers--0.1.8--0.5.3.sql ├── wrappers--0.1.9--0.5.3.sql ├── wrappers--0.2.0--0.5.3.sql ├── wrappers--0.3.0--0.5.3.sql ├── wrappers--0.3.1--0.5.3.sql ├── wrappers--0.4.0--0.5.3.sql ├── wrappers--0.4.1--0.5.3.sql ├── wrappers--0.4.2--0.5.3.sql ├── wrappers--0.4.3--0.5.3.sql ├── wrappers--0.4.4--0.5.3.sql ├── wrappers--0.4.5--0.5.3.sql ├── wrappers--0.4.6--0.5.3.sql ├── wrappers--0.5.0--0.5.3.sql ├── wrappers--0.5.3.control -> /nix/store/m15jazn3jznd17naihs4w413r2wdwzpz-wrappers-0.5.3/share/postgresql/extension/wrappers--0.5.3.control ├── wrappers--0.5.3.sql -> /nix/store/m15jazn3jznd17naihs4w413r2wdwzpz-wrappers-0.5.3/share/postgresql/extension/wrappers--0.5.3.sql └── wrappers.control 5 directories, 61 files ``` </details>
diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix
@@ -17,7 +17,6 @@ let
     version: hash: rustVersion: pgrxVersion:
     let
       cargo = rust-bin.stable.${rustVersion}.default;
-      #previousVersions = lib.filter (v: v != version) versions; # FIXME
       mkPgrxExtension = callPackages ../../cargo-pgrx/mkPgrxExtension.nix {
         inherit rustVersion pgrxVersion;
       };
@@ -129,20 +128,12 @@ let
         doCheck = false;
 
         postInstall = ''
-           create_control_files() {
-             sed -e "/^default_version =/d" \
-                 -e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}'|" \
-               $out/share/postgresql/extension/${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control
-             rm $out/share/postgresql/extension/${pname}.control
-
-             if [[ "${version}" == "${latestVersion}" ]]; then
-               {
-                 echo "default_version = '${latestVersion}'"
-                 cat $out/share/postgresql/extension/${pname}--${latestVersion}.control
-               } > $out/share/postgresql/extension/${pname}.control
-               ln -sfn ${pname}-${latestVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
-             fi
-           }
+          create_control_files() {
+            sed -e "/^default_version =/d" \
+                -e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}-${version}'|" \
+              $out/share/postgresql/extension/${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control
+            rm $out/share/postgresql/extension/${pname}.control
+          }
 
           create_control_files
         '';
@@ -165,6 +156,37 @@ let
         };
       }
     );
+  previouslyPackagedVersions = [
+    "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"
+    "0.1.17"
+    "0.1.16"
+    "0.1.15"
+    "0.1.14"
+    "0.1.12"
+    "0.1.11"
+    "0.1.10"
+    "0.1.9"
+    "0.1.8"
+    "0.1.7"
+    "0.1.6"
+    "0.1.5"
+    "0.1.4"
+    "0.1.1"
+    "0.1.0"
+  ];
+  numberOfPreviouslyPackagedVersions = builtins.length previouslyPackagedVersions;
   allVersions = (builtins.fromJSON (builtins.readFile ../versions.json)).wrappers;
   supportedVersions = lib.filterAttrs (
     _: value: builtins.elem (lib.versions.major postgresql.version) value.postgresql
@@ -184,29 +206,48 @@ buildEnv {
     "/share/postgresql/extension"
   ];
   postBuild = ''
-    # checks
-    (set -x
-       test "$(ls -A $out/lib/${pname}*${postgresql.dlSuffix} | wc -l)" = "${
-         toString (numberOfVersions + 1)
-       }"
-    )
-
-    create_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_control_files() {
+      # Create main control file pointing to latest version
+      {
+        echo "default_version = '${latestVersion}'"
+        cat $out/share/postgresql/extension/${pname}--${latestVersion}.control
+      } > $out/share/postgresql/extension/${pname}.control
+    }
+
+    create_lib_files() {
+      # Create main library symlink to latest version
+      ln -sfn ${pname}-${latestVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
+
+      # Create symlinks for all previously packaged versions to main library
+      for v in ${lib.concatStringsSep " " previouslyPackagedVersions}; do
+        ln -sfn $out/lib/${pname}${postgresql.dlSuffix} $out/lib/${pname}-$v${postgresql.dlSuffix}
+      done
     }
 
-    create_sql_files
+    create_migration_sql_files() {
+      # 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
+          if [[ "$(printf '%s\n%s' "$prev_version" "$curr_version" | sort -V | head -n1)" == "$prev_version" ]] && [[ "$prev_version" != "$curr_version" ]]; then
+            main_sql_file="$out/share/postgresql/extension/wrappers--$curr_version.sql"
+            if [ -f "$main_sql_file" ]; then
+              new_file="$out/share/postgresql/extension/wrappers--$prev_version--$curr_version.sql"
+              cp "$main_sql_file" "$new_file"
+              sed -i 's|$libdir/wrappers-[0-9.]*|$libdir/wrappers|g' "$new_file"
+            fi
+          fi
+        done
+      done
+    }
+
+    create_control_files
+    create_lib_files
+    create_migration_sql_files
+
+    # checks
+    (test "$(ls -A $out/lib/${pname}*${postgresql.dlSuffix} | wc -l)" = "${
+      toString (numberOfVersions + numberOfPreviouslyPackagedVersions + 1)
+    }")
   '';
   passthru = {
     inherit versions numberOfVersions;
