From 0d31bb269a32c43d56eef9d120d9e23fd411faab Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 29 Jan 2025 09:46:37 -0500 Subject: [PATCH 1/2] fix: custom scripts were not configured to run correctly --- nix/tools/run-server.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/tools/run-server.sh.in b/nix/tools/run-server.sh.in index ef2395aa9..75c5f8de7 100644 --- a/nix/tools/run-server.sh.in +++ b/nix/tools/run-server.sh.in @@ -198,7 +198,8 @@ echo "NOTE: patching postgresql.conf files" cp "$PG_HBA_FILE" "$DATDIR/pg_hba.conf" cp "$PG_IDENT_FILE" "$DATDIR/pg_ident.conf" cp "$READREPL_CONFIG_FILE" "$DATDIR/read-replica.conf" -cp -r "$EXTENSION_CUSTOM_SCRIPTS" "$DATDIR" +mkdir -p "$DATDIR/extension-custom-scripts" +cp -r "$EXTENSION_CUSTOM_SCRIPTS"/* "$DATDIR/extension-custom-scripts" # Configure supautils sed "s|supautils.privileged_extensions_custom_scripts_path = '/etc/postgresql-custom/extension-custom-scripts'|supautils.privileged_extensions_custom_scripts_path = '$DATDIR/extension-custom-scripts'|" "$SUPAUTILS_CONFIG_FILE" > "$DATDIR/supautils.conf" From 96d9d348c452055661e7d8992c5f48c7b3216a09 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 29 Jan 2025 10:13:15 -0500 Subject: [PATCH 2/2] chore: updated pg_regress to reflect updated config --- nix/tests/expected/z_15_ext_interface.out | 2 +- nix/tests/expected/z_17_ext_interface.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/tests/expected/z_15_ext_interface.out b/nix/tests/expected/z_15_ext_interface.out index 648693928..7f53984f3 100644 --- a/nix/tests/expected/z_15_ext_interface.out +++ b/nix/tests/expected/z_15_ext_interface.out @@ -1339,7 +1339,7 @@ order by pgmq | pgmq | delete | queue_name text, msg_id bigint | boolean pgmq | pgmq | delete | queue_name text, msg_ids bigint[] | SETOF bigint pgmq | pgmq | detach_archive | queue_name text | void - pgmq | pgmq | drop_queue | queue_name text, partitioned boolean | boolean + pgmq | pgmq | drop_queue | queue_name text | boolean pgmq | pgmq | format_table_name | queue_name text, prefix text | text pgmq | pgmq | list_queues | | SETOF pgmq.queue_record pgmq | pgmq | metrics | queue_name text | pgmq.metrics_result diff --git a/nix/tests/expected/z_17_ext_interface.out b/nix/tests/expected/z_17_ext_interface.out index 5a0dc32d3..7e2dc5fd2 100644 --- a/nix/tests/expected/z_17_ext_interface.out +++ b/nix/tests/expected/z_17_ext_interface.out @@ -1360,7 +1360,7 @@ order by pgmq | pgmq | delete | queue_name text, msg_id bigint | boolean pgmq | pgmq | delete | queue_name text, msg_ids bigint[] | SETOF bigint pgmq | pgmq | detach_archive | queue_name text | void - pgmq | pgmq | drop_queue | queue_name text, partitioned boolean | boolean + pgmq | pgmq | drop_queue | queue_name text | boolean pgmq | pgmq | format_table_name | queue_name text, prefix text | text pgmq | pgmq | list_queues | | SETOF pgmq.queue_record pgmq | pgmq | metrics | queue_name text | pgmq.metrics_result