Skip to content

Commit 7568895

Browse files
authored
Merge branch 'develop' into sam/wal-g-3
2 parents 78ec62f + 3642def commit 7568895

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

Diff for: ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
EXTENSIONS_TO_DISABLE=(
1313
"pg_graphql"
1414
"pg_stat_monitor"
15+
"pg_backtrace"
1516
)
1617

1718
PG14_EXTENSIONS_TO_DISABLE=(
@@ -217,6 +218,7 @@ function initiate_upgrade {
217218
SHARED_PRELOAD_LIBRARIES=$(echo "$SHARED_PRELOAD_LIBRARIES" | sed "s/pg_net//" | xargs)
218219
SHARED_PRELOAD_LIBRARIES=$(echo "$SHARED_PRELOAD_LIBRARIES" | sed "s/check_role_membership//" | xargs)
219220
SHARED_PRELOAD_LIBRARIES=$(echo "$SHARED_PRELOAD_LIBRARIES" | sed "s/safeupdate//" | xargs)
221+
SHARED_PRELOAD_LIBRARIES=$(echo "$SHARED_PRELOAD_LIBRARIES" | sed "s/pg_backtrace//" | xargs)
220222

221223
# Exclude empty-string entries, as well as leading/trailing commas and spaces resulting from the above lib exclusions
222224
# i.e. " , pg_stat_statements, , pgsodium, " -> "pg_stat_statements, pgsodium"

Diff for: flake.nix

-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
./nix/ext/postgis.nix
127127
./nix/ext/pgrouting.nix
128128
./nix/ext/pgtap.nix
129-
./nix/ext/pg_backtrace.nix
130129
./nix/ext/pg_cron.nix
131130
./nix/ext/pgsql-http.nix
132131
./nix/ext/pg_plan_filter.nix

Diff for: nix/tests/expected/z_15_ext_interface.out

+2-4
Large diffs are not rendered by default.

Diff for: nix/tests/expected/z_17_ext_interface.out

+2-4
Large diffs are not rendered by default.

Diff for: nix/tests/postgresql.conf.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ default_text_search_config = 'pg_catalog.english'
718718

719719
#local_preload_libraries = ''
720720
#session_preload_libraries = ''
721-
shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter, pg_backtrace' # (change requires restart)
721+
shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter' # (change requires restart)
722722
jit_provider = 'llvmjit' # JIT library to use
723723

724724

Diff for: nix/tests/prime.sql

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ create extension if not exists lo;
2828
create extension if not exists ltree;
2929
create extension if not exists moddatetime;
3030
create extension if not exists pageinspect;
31-
create extension if not exists pg_backtrace;
3231
create extension if not exists pg_buffercache;
3332

3433
/*

0 commit comments

Comments
 (0)