From ec432b4d45675533152386cb84718b8f51d6b0e0 Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Fri, 3 Apr 2026 09:24:24 -0400
Subject: [PATCH 1/7] fix: include switch script for all multiversion

---
 ansible/vars.yml                  | 6 +++---
 nix/ext/hypopg.nix                | 6 ++++++
 nix/ext/pg-safeupdate.nix         | 4 ++++
 nix/ext/pg_graphql/default.nix    | 6 ++++++
 nix/ext/pg_hashids.nix            | 6 ++++++
 nix/ext/pg_jsonschema/default.nix | 6 ++++++
 nix/ext/pg_plan_filter.nix        | 4 ++++
 nix/ext/pg_repack.nix             | 6 ++++++
 nix/ext/pg_stat_monitor.nix       | 6 ++++++
 nix/ext/pg_tle.nix                | 6 ++++++
 nix/ext/pgaudit.nix               | 6 ++++++
 nix/ext/pgroonga/default.nix      | 5 +++++
 nix/ext/pgrouting/default.nix     | 6 ++++++
 nix/ext/pgsodium.nix              | 6 ++++++
 nix/ext/pgtap.nix                 | 8 ++++++++
 nix/ext/pgvector.nix              | 8 ++++++++
 nix/ext/rum.nix                   | 6 ++++++
 nix/ext/vault.nix                 | 8 ++++++++
 18 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/ansible/vars.yml b/ansible/vars.yml
index 8d612b970b..5c929c7a80 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.061-orioledb"
-  postgres17: "17.6.1.104"
-  postgres15: "15.14.1.104"
+  postgresorioledb-17: "17.6.0.061-orioledb-switch-1"
+  postgres17: "17.6.1.104-switch-1"
+  postgres15: "15.14.1.104-switch-1"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.25.1
diff --git a/nix/ext/hypopg.nix b/nix/ext/hypopg.nix
index b3e880a1b6..d95a1c7f71 100644
--- a/nix/ext/hypopg.nix
+++ b/nix/ext/hypopg.nix
@@ -4,6 +4,8 @@
   buildEnv,
   fetchFromGitHub,
   postgresql,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 
@@ -78,6 +80,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -89,6 +92,9 @@ buildEnv {
          toString (numberOfVersionsBuilt + 1)
        }"
     )
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pg-safeupdate.nix b/nix/ext/pg-safeupdate.nix
index 97921c9c6c..168772ce23 100644
--- a/nix/ext/pg-safeupdate.nix
+++ b/nix/ext/pg-safeupdate.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   postgresql,
   makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 
@@ -76,6 +77,9 @@ pkgs.buildEnv {
          toString (numberOfVersionsBuilt + 1)
        }"
     )
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pg_graphql/default.nix b/nix/ext/pg_graphql/default.nix
index 11ea156dc5..4f81af624b 100644
--- a/nix/ext/pg_graphql/default.nix
+++ b/nix/ext/pg_graphql/default.nix
@@ -7,6 +7,8 @@
   postgresql,
   rust-bin,
   rsync,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 
@@ -139,6 +141,7 @@ in
 (buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -177,6 +180,9 @@ in
          toString (numberOfVersionsBuilt + 1)
        }"
     )
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
   passthru = {
     versions = versionsBuilt;
diff --git a/nix/ext/pg_hashids.nix b/nix/ext/pg_hashids.nix
index c8fc3fef55..d9d4a34077 100644
--- a/nix/ext/pg_hashids.nix
+++ b/nix/ext/pg_hashids.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   postgresql,
   buildEnv,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -86,6 +88,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -97,6 +100,9 @@ buildEnv {
          toString (numberOfVersionsBuilt + 1)
        }"
     )
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pg_jsonschema/default.nix b/nix/ext/pg_jsonschema/default.nix
index 4ec4f97a97..ec39a69fe2 100644
--- a/nix/ext/pg_jsonschema/default.nix
+++ b/nix/ext/pg_jsonschema/default.nix
@@ -6,6 +6,8 @@
   fetchFromGitHub,
   postgresql,
   rust-bin,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -146,6 +148,7 @@ in
 (pkgs.buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -175,6 +178,9 @@ in
     }
 
     create_sql_files
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pg_plan_filter.nix b/nix/ext/pg_plan_filter.nix
index 402f6b1924..847c7a2d11 100644
--- a/nix/ext/pg_plan_filter.nix
+++ b/nix/ext/pg_plan_filter.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   postgresql,
   makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 
@@ -79,6 +80,9 @@ pkgs.buildEnv {
          toString (numberOfVersionsBuilt + 1)
        }"
     )
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pg_repack.nix b/nix/ext/pg_repack.nix
index 89b1d11182..1a7500ea27 100644
--- a/nix/ext/pg_repack.nix
+++ b/nix/ext/pg_repack.nix
@@ -6,6 +6,8 @@
   postgresqlTestHook,
   testers,
   buildEnv,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -113,6 +115,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
 
   pathsToLink = [
     "/bin"
@@ -131,6 +134,9 @@ buildEnv {
       ls -la $out/lib/*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pg_stat_monitor.nix b/nix/ext/pg_stat_monitor.nix
index c82eaf8301..9a58464a66 100644
--- a/nix/ext/pg_stat_monitor.nix
+++ b/nix/ext/pg_stat_monitor.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   postgresql,
   buildEnv,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -84,6 +86,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
 
   pathsToLink = [
     "/lib"
@@ -101,6 +104,9 @@ buildEnv {
       ls -la $out/lib/*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pg_tle.nix b/nix/ext/pg_tle.nix
index d5d1e44464..45ba670385 100644
--- a/nix/ext/pg_tle.nix
+++ b/nix/ext/pg_tle.nix
@@ -7,6 +7,8 @@
   flex,
   openssl,
   libkrb5,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -91,6 +93,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -102,6 +105,9 @@ buildEnv {
          toString (numberOfVersionsBuilt + 1)
        }"
     )
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pgaudit.nix b/nix/ext/pgaudit.nix
index 06e4bca40d..74429fa415 100644
--- a/nix/ext/pgaudit.nix
+++ b/nix/ext/pgaudit.nix
@@ -6,6 +6,8 @@
   libkrb5,
   openssl,
   postgresql,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 #adapted from https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/sql/postgresql/ext/pgaudit.nix
@@ -138,6 +140,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -231,6 +234,9 @@ buildEnv {
       ls -la $out/lib/${pname}*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pgroonga/default.nix b/nix/ext/pgroonga/default.nix
index 4a824ac25b..42345bd49a 100644
--- a/nix/ext/pgroonga/default.nix
+++ b/nix/ext/pgroonga/default.nix
@@ -11,6 +11,7 @@
   buildEnv,
   supabase-groonga,
   mecab-naist-jdic,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -157,6 +158,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
 
   pathsToLink = [
     "/lib"
@@ -173,6 +175,9 @@ buildEnv {
       ls -la $out/lib/*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pgrouting/default.nix b/nix/ext/pgrouting/default.nix
index cff4e7d862..87d190cdc7 100644
--- a/nix/ext/pgrouting/default.nix
+++ b/nix/ext/pgrouting/default.nix
@@ -7,6 +7,8 @@
   cmake,
   boost,
   buildEnv,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -127,6 +129,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
 
   pathsToLink = [
     "/lib"
@@ -144,6 +147,9 @@ buildEnv {
       ls -la $out/lib/*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pgsodium.nix b/nix/ext/pgsodium.nix
index ad5cd008b4..5a615a8722 100644
--- a/nix/ext/pgsodium.nix
+++ b/nix/ext/pgsodium.nix
@@ -5,6 +5,8 @@
   fetchFromGitHub,
   postgresql,
   libsodium,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -87,6 +89,7 @@ in
 pkgs.buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -103,6 +106,9 @@ pkgs.buildEnv {
       ls -la $out/lib/${pname}*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/pgtap.nix b/nix/ext/pgtap.nix
index 2953f62bc0..f283774dc8 100644
--- a/nix/ext/pgtap.nix
+++ b/nix/ext/pgtap.nix
@@ -8,6 +8,8 @@
   which,
   buildEnv,
   fetchpatch2,
+  makeWrapper,
+  switch-ext-version,
 }:
 let
   pname = "pgtap";
@@ -119,12 +121,18 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
 
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
   ];
 
+  postBuild = ''
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
+  '';
+
   passthru = {
     inherit versions numberOfVersions;
     pname = "${pname}-all";
diff --git a/nix/ext/pgvector.nix b/nix/ext/pgvector.nix
index 12b8816d63..5f613b3d52 100644
--- a/nix/ext/pgvector.nix
+++ b/nix/ext/pgvector.nix
@@ -4,6 +4,8 @@
   stdenv,
   fetchFromGitHub,
   postgresql,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -82,11 +84,17 @@ in
 pkgs.buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
   ];
 
+  postBuild = ''
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_vector_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
+  '';
+
   passthru = {
     versions = versionsBuilt;
     numberOfVersions = numberOfVersionsBuilt;
diff --git a/nix/ext/rum.nix b/nix/ext/rum.nix
index a16be47c97..31e6bae07b 100644
--- a/nix/ext/rum.nix
+++ b/nix/ext/rum.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   postgresql,
   buildEnv,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -81,6 +83,7 @@ in
 buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
 
   pathsToLink = [
     "/lib"
@@ -98,6 +101,9 @@ buildEnv {
       ls -la $out/lib/*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
diff --git a/nix/ext/vault.nix b/nix/ext/vault.nix
index c48546ecb5..18ffe0aa77 100644
--- a/nix/ext/vault.nix
+++ b/nix/ext/vault.nix
@@ -5,6 +5,8 @@
   fetchFromGitHub,
   libsodium,
   postgresql,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -85,11 +87,17 @@ in
 pkgs.buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
   ];
 
+  postBuild = ''
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
+  '';
+
   passthru = {
     versions = versionsBuilt;
     numberOfVersions = numberOfVersionsBuilt;

From 57f6c8fab5dcd3c4f8759a21b45aa14a13981722 Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Fri, 3 Apr 2026 14:54:39 -0400
Subject: [PATCH 2/7] fix: switch-ext on wrappers

---
 nix/ext/wrappers/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix
index 750c983ed9..ad6acb7563 100644
--- a/nix/ext/wrappers/default.nix
+++ b/nix/ext/wrappers/default.nix
@@ -7,6 +7,8 @@
   pkg-config,
   postgresql,
   buildEnv,
+  makeWrapper,
+  switch-ext-version,
   rust-bin,
   git,
   latestOnly ? false,
@@ -246,6 +248,7 @@ in
 (buildEnv {
   name = pname;
   paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -335,6 +338,9 @@ in
     create_lib_files
     ${if latestOnly then "" else "create_migration_sql_files"}
 
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
+
     # Verify library count matches expected
     ${
       if latestOnly then

From 319ea5c8f6f74300e3e0335b99c86eb4dcf5d999 Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Fri, 3 Apr 2026 15:57:20 -0400
Subject: [PATCH 3/7] fix: switch-ext-http

---
 nix/ext/pgsql-http.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nix/ext/pgsql-http.nix b/nix/ext/pgsql-http.nix
index e36f4a2187..5815f91607 100644
--- a/nix/ext/pgsql-http.nix
+++ b/nix/ext/pgsql-http.nix
@@ -5,6 +5,8 @@
   fetchFromGitHub,
   postgresql,
   curl,
+  makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 let
@@ -55,8 +57,8 @@ let
 
         mkdir -p $out/{lib,share/postgresql/extension}
 
-        # Install versioned library
-        install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${fileVersion}${postgresql.dlSuffix}
+        # Install versioned library (single dash for switch-ext-version compatibility)
+        install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}-${fileVersion}${postgresql.dlSuffix}
 
         cp ${pname}--${fileVersion}.sql $out/share/postgresql/extension/${pname}--${fileVersion}.sql
 
@@ -71,7 +73,7 @@ let
             echo "default_version = '${fileVersion}'"
             cat $out/share/postgresql/extension/${pname}--${fileVersion}.control
           } > $out/share/postgresql/extension/${pname}.control
-          ln -sfn ${pname}--${fileVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
+          ln -sfn ${pname}-${fileVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
           cp *.sql $out/share/postgresql/extension
         fi
 
@@ -89,7 +91,7 @@ in
 pkgs.buildEnv {
   name = pname;
   paths = packages;
-
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -105,6 +107,9 @@ pkgs.buildEnv {
       ls -la $out/lib/${pname}*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {

From 4b9760b9edbd95eb3885d081abe2c29e537063bd Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Fri, 3 Apr 2026 16:17:06 -0400
Subject: [PATCH 4/7] fix: postgis switch-ext script

---
 nix/ext/postgis.nix | 48 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/nix/ext/postgis.nix b/nix/ext/postgis.nix
index 74539e5de3..99afea6f5b 100644
--- a/nix/ext/postgis.nix
+++ b/nix/ext/postgis.nix
@@ -16,6 +16,10 @@
   nixosTests,
   callPackage,
   buildEnv,
+  makeWrapper,
+  switch-ext-version,
+  writeShellApplication,
+  coreutils,
   sfcgal,
   latestOnly ? false,
 }:
@@ -44,6 +48,40 @@ let
   numberOfVersionsBuilt = builtins.length versionsBuilt;
   packages = builtins.attrValues (lib.mapAttrs (name: value: build name value.hash) versionsToUse);
 
+  # Custom switch script for postgis — handles all sub-libraries with -3 naming.
+  # The generic switch-ext-version handles the main postgis library (postgis.so -> postgis-VERSION.so)
+  # and control file. This EXTRA_STEPS script handles the -3 symlink plus the 4 additional sub-libraries.
+  postgis-switch-extra-steps = writeShellApplication {
+    name = "postgis-switch-extra-steps";
+    runtimeInputs = [ coreutils ];
+    text = ''
+      EXT_WRAPPER_LIB="$EXT_WRAPPER/lib"
+      CONTROL_DIR="$EXT_WRAPPER/share/postgresql/extension"
+
+      # Repoint the postgis-3 symlink (module_pathname uses $libdir/postgis-3)
+      if [ -f "$EXT_WRAPPER_LIB/postgis-''${VERSION}${postgresql.dlSuffix}" ]; then
+        ln -sfnv "postgis-''${VERSION}${postgresql.dlSuffix}" "$EXT_WRAPPER_LIB/postgis-3${postgresql.dlSuffix}"
+      fi
+
+      # Switch additional sub-libraries
+      for ext in postgis_raster postgis_topology postgis_sfcgal address_standardizer; do
+        VERSIONED_LIB="$EXT_WRAPPER_LIB/$ext-''${VERSION}${postgresql.dlSuffix}"
+        DEFAULT_LIB="$EXT_WRAPPER_LIB/$ext-3${postgresql.dlSuffix}"
+        if [ -f "$VERSIONED_LIB" ]; then
+          ln -sfnv "$VERSIONED_LIB" "$DEFAULT_LIB"
+
+          # Update control file for this sub-extension
+          if [ -f "$CONTROL_DIR/$ext--''${VERSION}.control" ]; then
+            echo "default_version = '$VERSION'" > "$CONTROL_DIR/$ext.control"
+            cat "$CONTROL_DIR/$ext--''${VERSION}.control" >> "$CONTROL_DIR/$ext.control"
+          fi
+        else
+          echo "Warning: $ext versioned library not found at $VERSIONED_LIB, skipping"
+        fi
+      done
+    '';
+  };
+
   # List of C extensions to be included in the build
   cExtensions = [
     "address_standardizer"
@@ -188,7 +226,7 @@ in
 (buildEnv {
   name = pname;
   paths = packages;
-
+  nativeBuildInputs = [ makeWrapper ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"
@@ -207,6 +245,14 @@ in
       ls -la $out/lib/*${postgresql.dlSuffix} || true
       exit 1
     fi
+
+    # PostGIS has multiple sub-libraries (postgis-3, postgis_raster-3, etc.).
+    # The generic switch-ext-version handles the main postgis.so symlink and control file.
+    # EXTRA_STEPS repoints the -3 symlinks and switches the 4 additional sub-libraries.
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" \
+      --prefix EXT_NAME : "${pname}" \
+      --prefix EXTRA_STEPS : "${lib.getExe postgis-switch-extra-steps}"
   '';
 
   passthru = {

From 249bc18fd70f39ad687c82c07b55f9a17070d16a Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Fri, 3 Apr 2026 16:43:16 -0400
Subject: [PATCH 5/7] fix: wal2json

---
 nix/ext/wal2json.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nix/ext/wal2json.nix b/nix/ext/wal2json.nix
index f1ccd273b5..b082301c82 100644
--- a/nix/ext/wal2json.nix
+++ b/nix/ext/wal2json.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   postgresql,
   makeWrapper,
+  switch-ext-version,
   latestOnly ? false,
 }:
 
@@ -93,6 +94,9 @@ pkgs.buildEnv {
       previous_version=$ver
     done
 
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
+
     # checks
     (set -x
        test "$(ls -A $out/lib/${pname}*${postgresql.dlSuffix} | wc -l)" = "${

From 235f799a15d781cddcfa160dbfd9112ce17f1184 Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Tue, 7 Apr 2026 14:22:15 -0400
Subject: [PATCH 6/7] chore: bump to release

---
 ansible/vars.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/vars.yml b/ansible/vars.yml
index 5c929c7a80..3d8b6a1ef8 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.061-orioledb-switch-1"
-  postgres17: "17.6.1.104-switch-1"
-  postgres15: "15.14.1.104-switch-1"
+  postgresorioledb-17: "17.6.0.062-orioledb"
+  postgres17: "17.6.1.105"
+  postgres15: "15.14.1.105"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.25.1

From 2e1a3e8ab5c46c6c888f62104139d0207d6b0b9c Mon Sep 17 00:00:00 2001
From: Sam Rose <samuel@supabase.io>
Date: Tue, 7 Apr 2026 17:04:47 -0400
Subject: [PATCH 7/7] chore: go back to suffix for more testing

---
 ansible/vars.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/vars.yml b/ansible/vars.yml
index 3d8b6a1ef8..5c929c7a80 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.062-orioledb"
-  postgres17: "17.6.1.105"
-  postgres15: "15.14.1.105"
+  postgresorioledb-17: "17.6.0.061-orioledb-switch-1"
+  postgres17: "17.6.1.104-switch-1"
+  postgres15: "15.14.1.104-switch-1"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.25.1