Skip to content

Commit d35cdbf

Browse files
committed
revert: drop the default extension install schema setting, landing separately with salt sync and a breaking change announcement
1 parent 45dc374 commit d35cdbf

4 files changed

Lines changed: 12 additions & 13 deletions

File tree

‎ansible/files/postgresql_config/supautils.conf.j2‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ supautils.drop_trigger_grants = '{"postgres":["auth.audit_log_entries","auth.flo
88
# omitted because protected: plpgsql
99
# NOTE: keep nix/tests/prime-superuser.sql in sync with the "may be unsafe" + "deprecated" lists above.
1010
supautils.privileged_extensions = 'address_standardizer, address_standardizer_data_us, amcheck, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, fuzzystrmatch, hstore, http, hypopg, index_advisor, insert_username, intarray, isn, ltree, moddatetime, orioledb, pg_buffercache, pg_cron, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_prewarm, pg_repack, pg_stat_monitor, pg_stat_statements, pg_tle, pg_trgm, pg_walinspect, pgaudit, pgcrypto, pgjwt, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgsodium, pgstattuple, pgtap, plcoffee, pljava, plls, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers'
11-
supautils.default_extension_install_schema = 'extensions'
1211
supautils.extension_custom_scripts_path = '/etc/postgresql-custom/extension-custom-scripts'
1312
supautils.restrict_extension_versions = 'warn'
1413
supautils.privileged_extensions_superuser = 'supabase_admin'

‎nix/tests/expected/evtrigs.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ order by e.evtname;
2020
issue_pg_graphql_access | supabase_admin | extensions | grant_pg_graphql_access | supabase_admin
2121
issue_pg_net_access | supabase_admin | extensions | grant_pg_net_access | supabase_admin
2222
pg_tle_event_trigger_for_drop_function | supabase_admin | pgtle | pgtle.pg_tle_feature_info_sql_drop | supabase_admin
23-
pgaudit_ddl_command_end | supabase_admin | extensions | pgaudit_ddl_command_end | supabase_admin
24-
pgaudit_sql_drop | supabase_admin | extensions | pgaudit_sql_drop | supabase_admin
23+
pgaudit_ddl_command_end | supabase_admin | public | pgaudit_ddl_command_end | supabase_admin
24+
pgaudit_sql_drop | supabase_admin | public | pgaudit_sql_drop | supabase_admin
2525
pgrst_ddl_watch | supabase_admin | extensions | pgrst_ddl_watch | supabase_admin
2626
pgrst_drop_watch | supabase_admin | extensions | pgrst_drop_watch | supabase_admin
2727
pgsodium_trg_mask_update | supabase_admin | pgsodium | pgsodium.trg_mask_update | supabase_admin

‎nix/tests/expected/pgrst_watch_triggers.out‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-- returns how many notifications it received since the previous call. The
1313
-- notifying backend PID is left out so the output is deterministic.
1414
set client_min_messages = warning;
15-
select extensions.dblink_connect(
15+
select public.dblink_connect(
1616
'pgrst_listener',
1717
format('host=localhost port=%s dbname=%s user=supabase_admin',
1818
current_setting('port'), current_database())
@@ -22,7 +22,7 @@ select extensions.dblink_connect(
2222
OK
2323
(1 row)
2424

25-
select extensions.dblink_exec('pgrst_listener', 'LISTEN pgrst');
25+
select public.dblink_exec('pgrst_listener', 'LISTEN pgrst');
2626
dblink_exec
2727
-------------
2828
LISTEN
@@ -32,8 +32,8 @@ create function pg_temp.pgrst_reloads() returns bigint
3232
language plpgsql as $$
3333
begin
3434
-- round trip so the listener has flushed any pending notification
35-
perform from extensions.dblink('pgrst_listener', 'SELECT 1') as t(x int);
36-
return (select count(*) from extensions.dblink_get_notify('pgrst_listener')
35+
perform from public.dblink('pgrst_listener', 'SELECT 1') as t(x int);
36+
return (select count(*) from public.dblink_get_notify('pgrst_listener')
3737
where notify_name = 'pgrst' and extra = 'reload schema');
3838
end $$;
3939
-- Setup, notifications drained below. auth, realtime and storage come from
@@ -329,7 +329,7 @@ select pg_temp.pgrst_reloads() as drop_schema;
329329

330330
-- Cleanup
331331
drop schema _realtime;
332-
select extensions.dblink_disconnect('pgrst_listener');
332+
select public.dblink_disconnect('pgrst_listener');
333333
dblink_disconnect
334334
-------------------
335335
OK

‎nix/tests/sql/pgrst_watch_triggers.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414

1515
set client_min_messages = warning;
1616

17-
select extensions.dblink_connect(
17+
select public.dblink_connect(
1818
'pgrst_listener',
1919
format('host=localhost port=%s dbname=%s user=supabase_admin',
2020
current_setting('port'), current_database())
2121
);
22-
select extensions.dblink_exec('pgrst_listener', 'LISTEN pgrst');
22+
select public.dblink_exec('pgrst_listener', 'LISTEN pgrst');
2323

2424
create function pg_temp.pgrst_reloads() returns bigint
2525
language plpgsql as $$
2626
begin
2727
-- round trip so the listener has flushed any pending notification
28-
perform from extensions.dblink('pgrst_listener', 'SELECT 1') as t(x int);
29-
return (select count(*) from extensions.dblink_get_notify('pgrst_listener')
28+
perform from public.dblink('pgrst_listener', 'SELECT 1') as t(x int);
29+
return (select count(*) from public.dblink_get_notify('pgrst_listener')
3030
where notify_name = 'pgrst' and extra = 'reload schema');
3131
end $$;
3232

@@ -173,4 +173,4 @@ select pg_temp.pgrst_reloads() as drop_schema;
173173

174174
-- Cleanup
175175
drop schema _realtime;
176-
select extensions.dblink_disconnect('pgrst_listener');
176+
select public.dblink_disconnect('pgrst_listener');

0 commit comments

Comments
 (0)