fix: available, but not enabled pgjwt fixes (should still be controlled by supautils in all versions)

Author: samrose

ansible/tasks/stage2-setup-postgres.yml

@@ -29,19 +29,11 @@
     - name: Remove specified extensions from supautils.conf if orioledb-17 or 17 build
       ansible.builtin.command:
         cmd: >
-          sed -i 's/ timescaledb,//g; s/ plv8,//g; s/ pgjwt,//g' 
+          sed -i 's/ timescaledb,//g; s/ plv8,//g' 
           /etc/postgresql-custom/supautils.conf
       when: is_psql_oriole or is_psql_17 and stage2_nix
       become: yes
 
-    - name: Remove pgjwt from supautils.conf if 15 build
-      ansible.builtin.command:
-        cmd: >
-          sed -i 's/ pgjwt,//g' 
-          /etc/postgresql-custom/supautils.conf
-      when: is_psql_15 and stage2_nix
-      become: yes
-
     - name: Remove db_user_namespace from postgresql.conf if orioledb-17 or 17 build
       ansible.builtin.command:
         cmd: >

migrations/db/init-scripts/00000000000000-initial-schema.sql

@@ -18,16 +18,6 @@ grant pg_read_all_data to supabase_read_only_user;
 create schema if not exists extensions;
 create extension if not exists "uuid-ossp"      with schema extensions;
 create extension if not exists pgcrypto         with schema extensions;
-do $$
-begin 
-    if exists (select 1 from pg_available_extensions where name = 'pgjwt') then
-        if not exists (select 1 from pg_extension where extname = 'pgjwt') then
-            if current_setting('server_version_num')::int / 10000 = 15 then
-                create extension if not exists pgjwt with schema "extensions" cascade;
-            end if;
-        end if;
-    end if;
-end $$;
 
 
 -- Set up auth roles for the developer

nix/tests/expected/z_15_ext_interface.out

@@ -1,3 +1,7 @@
+-- Install pgjwt in extensions schema
+CREATE EXTENSION IF NOT EXISTS pgjwt WITH SCHEMA extensions;
+-- Set search path to include extensions schema
+SET search_path TO extensions, public;
 select
   sign(
     payload   := '{"sub":"1234567890","name":"John Doe","iat":1516239022}',

nix/tests/expected/z_15_pgjwt.out

@@ -57,16 +57,6 @@ create extension if not exists pg_walinspect;
 create extension if not exists pgaudit;
 create extension if not exists pgcrypto;
 create extension if not exists pgtap;
-do $$ 
-begin 
-    if exists (select 1 from pg_available_extensions where name = 'pgjwt') then
-        if not exists (select 1 from pg_extension where extname = 'pgjwt') then
-            if current_setting('server_version_num')::int / 10000 = 15 then
-                create extension if not exists pgjwt;
-            end if;
-        end if;
-    end if;
-end $$;
 create extension if not exists pgroonga;
 create extension if not exists pgroonga_database;
 create extension if not exists pgsodium;

nix/tests/prime.sql

@@ -1,3 +1,9 @@
+-- Install pgjwt in extensions schema
+CREATE EXTENSION IF NOT EXISTS pgjwt WITH SCHEMA extensions;
+
+-- Set search path to include extensions schema
+SET search_path TO extensions, public;
+
 select
   sign(
     payload   := '{"sub":"1234567890","name":"John Doe","iat":1516239022}',

nix/tests/sql/z_15_pgjwt.sql

@@ -267,13 +267,12 @@ orioledb_config_items() {
         echo "non-macos pg 17 conf"
         sed -i 's/ timescaledb,//g;' "$DATDIR/postgresql.conf"
         sed -i 's/db_user_namespace = off/#db_user_namespace = off/g;' "$DATDIR/postgresql.conf"
-        sed -i 's/ timescaledb,//g; s/ plv8,//g; s/ pgjwt,//g;' "$DATDIR/supautils.conf"
+        sed -i 's/ timescaledb,//g; s/ plv8,//g;' "$DATDIR/supautils.conf"
     elif [[ "$VERSION" == "17" && "$CURRENT_SYSTEM" = "aarch64-darwin" ]]; then
         perl -pi -e 's/db_user_namespace = off/#db_user_namespace = off/g;' "$DATDIR/postgresql.conf"
         perl -pi -e 's/ timescaledb,//g' "$DATDIR/postgresql.conf"
         perl -pi -e 's/ timescaledb,//g' "$DATDIR/supautils.conf"
         perl -pi -e 's/ plv8,//g;' "$DATDIR/supautils.conf"
-        perl -pi -e 's/ pgjwt,//g;' "$DATDIR/supautils.conf"
     fi
 }