Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- one-time repair: supautils only runs extension-custom-scripts on CREATE
-- EXTENSION, so installs that already ran it under the pre-#2539 hook never
-- pick up the new drop_queue(text, boolean) shim on their own.
do $$
begin
if exists (select from pg_extension where extname = 'pgmq')
and to_regprocedure('pgmq.drop_queue(text, boolean)') is null then
create function pgmq.drop_queue(queue_name text, partitioned boolean)
returns boolean language plpgsql as $f$
begin return pgmq.drop_queue(queue_name); end;
$f$;
alter extension pgmq add function pgmq.drop_queue(text, boolean);
end if;
end $$;
51 changes: 51 additions & 0 deletions nix/ext/tests/pgmq-drop-queue-repair.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{ self, pkgs }:
let
testLib = import ./lib.nix { inherit self pkgs; };

repairScript = pkgs.writeText "repair-drop-queue.sql" (
builtins.readFile ../../../ansible/files/postgresql_extension_custom_scripts/pgmq/repair-drop-queue.sql
);
in
pkgs.testers.runNixOSTest {
name = "pgmq-drop-queue-repair";
nodes.server =
{ ... }:
{
imports = [
(testLib.makeSupabaseTestConfig {
majorVersion = "15";
})
];
};
testScript =
{ ... }:
# python
''
def sql(query):
return server.succeed(
"psql -U supabase_admin -d postgres -t -A -c \"" + query.replace('"', '\\"') + "\""
).strip()

def run_repair():
server.succeed("psql -U supabase_admin -d postgres -f ${repairScript}")

start_all()
server.wait_for_unit("supabase-db-init.service")

with subtest("repairs a pre-fix install missing the 2-arg shim"):
server.succeed("psql -U supabase_admin -d postgres -c 'DROP EXTENSION IF EXISTS pgmq;'")
server.succeed(
"psql -U supabase_admin -d postgres -c \"CREATE EXTENSION pgmq WITH VERSION '1.4.4' CASCADE;\""
)
sql("alter extension pgmq drop function pgmq.drop_queue(text, boolean);")
sql("drop function pgmq.drop_queue(text, boolean);")

run_repair()
sql("select pgmq.create('q'); select pgmq.drop_queue('q', false);")

with subtest("no-op when already fixed or pgmq isn't installed"):
run_repair()
server.succeed("psql -U supabase_admin -d postgres -c 'DROP EXTENSION pgmq;'")
run_repair()
'';
}
Loading