Skip to content

Commit da8f9fe

Browse files
committed
chore: try to resolve pgjwt for pg 15
1 parent 5e4665b commit da8f9fe

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

ebssurrogate/files/unit-tests/unit-test-01.sql

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,59 @@ DO $$
55
DECLARE
66
extension_array text[];
77
orioledb_available boolean;
8+
has_pgjwt boolean;
89
BEGIN
910
-- Check if orioledb is available
1011
SELECT EXISTS (
1112
SELECT 1 FROM pg_available_extensions WHERE name = 'orioledb'
1213
) INTO orioledb_available;
13-
14-
-- If available, create it and add to the expected extensions list
14+
15+
-- Check if pgjwt is already installed
16+
SELECT EXISTS (
17+
SELECT 1 FROM pg_extension WHERE extname = 'pgjwt'
18+
) INTO has_pgjwt;
19+
20+
-- Base extensions list
21+
extension_array := ARRAY[
22+
'plpgsql',
23+
'pg_stat_statements',
24+
'pgsodium',
25+
'pgtap',
26+
'pg_graphql',
27+
'pgcrypto',
28+
'uuid-ossp',
29+
'supabase_vault'
30+
];
31+
32+
-- Add pgjwt if it's actually installed
33+
IF has_pgjwt THEN
34+
extension_array := array_append(extension_array, 'pgjwt');
35+
END IF;
36+
37+
-- Add orioledb if available and installed
1538
IF orioledb_available THEN
1639
CREATE EXTENSION IF NOT EXISTS orioledb;
17-
extension_array := ARRAY[
18-
'plpgsql',
19-
'pg_stat_statements',
20-
'pgtap',
21-
'pg_graphql',
22-
'pgcrypto',
23-
'uuid-ossp',
24-
'supabase_vault',
25-
'orioledb'
26-
];
27-
ELSE
28-
extension_array := ARRAY[
29-
'plpgsql',
30-
'pg_stat_statements',
31-
'pgtap',
32-
'pg_graphql',
33-
'pgcrypto',
34-
'uuid-ossp',
35-
'supabase_vault'
36-
];
40+
extension_array := array_append(extension_array, 'orioledb');
3741
END IF;
3842

3943
-- Set the array as a temporary variable to use in the test
4044
PERFORM set_config('myapp.extensions', array_to_string(extension_array, ','), false);
4145
END $$;
4246

43-
SELECT no_plan();
47+
SELECT plan(8);
4448

4549
SELECT extensions_are(
4650
string_to_array(current_setting('myapp.extensions'), ',')::text[]
4751
);
4852

49-
5053
SELECT has_schema('pg_toast');
5154
SELECT has_schema('pg_catalog');
5255
SELECT has_schema('information_schema');
5356
SELECT has_schema('public');
5457

58+
SELECT function_privs_are('pgsodium', 'crypto_aead_det_decrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
59+
SELECT function_privs_are('pgsodium', 'crypto_aead_det_encrypt', array['bytea', 'bytea', 'uuid', 'bytea'], 'service_role', array['EXECUTE']);
60+
SELECT function_privs_are('pgsodium', 'crypto_aead_det_keygen', array[]::text[], 'service_role', array['EXECUTE']);
61+
5562
SELECT * FROM finish();
5663
ROLLBACK;

nix/tests/expected/z_15_ext_interface.out

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5227,11 +5227,7 @@ order by
52275227
xml2 | public | xpath_table | text, text, text, text, text | SETOF record
52285228
xml2 | public | xslt_process | text, text | text
52295229
xml2 | public | xslt_process | text, text, text | text
5230-
<<<<<<< HEAD
5231-
(5057 rows)
5232-
=======
52335230
(5055 rows)
5234-
>>>>>>> 37f97fb7 (chore: roles already created)
52355231

52365232
/*
52375233

0 commit comments

Comments
 (0)