Skip to content

Commit 0f390da

Browse files
committed
fix: include changes to search_path manipulation
1 parent e9ea460 commit 0f390da

File tree

6 files changed

+30
-3
lines changed

6 files changed

+30
-3
lines changed

ansible/files/postgresql_extension_custom_scripts/pgmq/after-create.sql

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ do $$
22
declare
33
extoid oid := (select oid from pg_extension where extname = 'pgmq');
44
extversion text := (select extversion from pg_extension where extname = 'pgmq');
5+
search_path text := (select current_setting('search_path'));
56
r record;
67
cls pg_class%rowtype;
78
begin
8-
9-
set local search_path = '';
9+
perform set_config('search_path', '', true);
1010

1111
/*
1212
Override the pgmq.drop_queue to check if relevant tables are owned
@@ -180,4 +180,7 @@ end if;
180180

181181
end if;
182182
end loop;
183+
184+
-- restore configs
185+
perform set_config('search_path', search_path, true);
183186
end $$;

ansible/files/postgresql_extension_custom_scripts/supabase_vault/after-create.sql

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
do $$
22
declare
33
extversion text := (select extversion from pg_extension where extname = 'supabase_vault');
4+
search_path text := (select current_setting('search_path'));
45
begin
5-
set local search_path = '';
6+
perform set_config('search_path', '', true);
67

78
if extversion != '0.2.8' then
89
grant usage on schema vault to postgres with grant option;
@@ -14,4 +15,7 @@ begin
1415
grant select, delete on vault.secrets, vault.decrypted_secrets to service_role;
1516
grant execute on function vault.create_secret, vault.update_secret, vault._crypto_aead_det_decrypt to service_role;
1617
end if;
18+
19+
-- restore configs
20+
perform set_config('search_path', search_path, true);
1721
end $$;

nix/tests/expected/pgmq.out

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,10 @@ order by
200200
pgmq | validate_queue_name | postgres
201201
(40 rows)
202202

203+
-- assert search_path is preserved after after-create script is run
204+
show search_path;
205+
search_path
206+
-----------------------------------
207+
"$user", public, auth, extensions
208+
(1 row)
209+

nix/tests/expected/vault.out

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,10 @@ ORDER BY
9797
vault | secrets | secrets_pkey | supabase_admin | Unique
9898
(2 rows)
9999

100+
-- assert search_path is preserved after after-create script is run
101+
show search_path;
102+
search_path
103+
-----------------------------------
104+
"$user", public, auth, extensions
105+
(1 row)
106+

nix/tests/sql/pgmq.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,6 @@ where
101101
n.nspname = 'pgmq'
102102
order by
103103
p.proname;
104+
105+
-- assert search_path is preserved after after-create script is run
106+
show search_path;

nix/tests/sql/vault.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@ WHERE
5151
ORDER BY
5252
t.relname,
5353
i.relname;
54+
55+
-- assert search_path is preserved after after-create script is run
56+
show search_path;

0 commit comments

Comments
 (0)