Skip to content

Commit 2aeac8b

Browse files
committed
fix: double-escaped identifiers
`::reg*` casts already escapes identifier names, so it's not necessary to format it with `%I`
1 parent 9eb7fc4 commit 2aeac8b

File tree

1 file changed

+12
-12
lines changed
  • ansible/files/admin_api_scripts/pg_upgrade_scripts

1 file changed

+12
-12
lines changed

ansible/files/admin_api_scripts/pg_upgrade_scripts/common.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ set session authorization supabase_tmp;
100100
do $$
101101
begin
102102
if exists (select from pg_extension where extname = 'timescaledb') then
103-
execute(format('select %I.timescaledb_pre_restore()', (select pronamespace::regnamespace from pg_proc where proname = 'timescaledb_pre_restore')));
103+
execute(format('select %s.timescaledb_pre_restore()', (select pronamespace::regnamespace from pg_proc where proname = 'timescaledb_pre_restore')));
104104
end if;
105105
end
106106
$$;
@@ -211,9 +211,9 @@ begin
211211
for rec in
212212
select * from pg_auth_members
213213
loop
214-
execute(format('revoke %I from %I;', rec.roleid::regrole, rec.member::regrole));
214+
execute(format('revoke %s from %s;', rec.roleid::regrole, rec.member::regrole));
215215
execute(format(
216-
'grant %I to %I %s granted by %I;',
216+
'grant %s to %s %s granted by %s;',
217217
case
218218
when rec.roleid = 'postgres'::regrole then 'supabase_admin'
219219
when rec.roleid = 'supabase_admin'::regrole then 'postgres'
@@ -335,13 +335,13 @@ begin
335335
from aclexplode((obj->>'acl')::aclitem[])
336336
loop
337337
if obj->>'role' in ('postgres', 'supabase_admin') or rec.grantee::regrole in ('postgres', 'supabase_admin') then
338-
execute(format('alter default privileges for role %I %s revoke %s on %s from %I'
338+
execute(format('alter default privileges for role %I %s revoke %s on %s from %s'
339339
, case when obj->>'role' = 'postgres' then 'supabase_admin'
340340
when obj->>'role' = 'supabase_admin' then 'postgres'
341341
else obj->>'role'
342342
end
343343
, case when obj->>'schema' is null then ''
344-
else format('in schema %I', (obj->>'schema')::regnamespace)
344+
else format('in schema %s', (obj->>'schema')::regnamespace)
345345
end
346346
, rec.privilege_type
347347
, case when obj->>'objtype' = 'r' then 'tables'
@@ -366,10 +366,10 @@ begin
366366
from aclexplode((obj->>'acl')::aclitem[])
367367
loop
368368
if obj->>'role' in ('postgres', 'supabase_admin') or rec.grantee::regrole in ('postgres', 'supabase_admin') then
369-
execute(format('alter default privileges for role %I %s grant %s on %s to %I %s'
369+
execute(format('alter default privileges for role %I %s grant %s on %s to %s %s'
370370
, obj->>'role'
371371
, case when obj->>'schema' is null then ''
372-
else format('in schema %I', (obj->>'schema')::regnamespace)
372+
else format('in schema %s', (obj->>'schema')::regnamespace)
373373
end
374374
, rec.privilege_type
375375
, case when obj->>'objtype' = 'r' then 'tables'
@@ -406,7 +406,7 @@ begin
406406
from aclexplode((obj->>'acl')::aclitem[])
407407
where grantee::regrole in ('postgres', 'supabase_admin')
408408
loop
409-
execute(format('grant %s on schema %s to %I %s', rec.privilege_type, (obj->>'oid')::regnamespace, rec.grantee::regrole, case when rec.is_grantable then 'with grant option' else '' end));
409+
execute(format('grant %s on schema %s to %s %s', rec.privilege_type, (obj->>'oid')::regnamespace, rec.grantee::regrole, case when rec.is_grantable then 'with grant option' else '' end));
410410
end loop;
411411
end loop;
412412
@@ -431,7 +431,7 @@ begin
431431
from aclexplode((obj->>'acl')::aclitem[])
432432
where grantee::regrole in ('postgres', 'supabase_admin')
433433
loop
434-
execute(format('grant %s on type %s to %I %s', rec.privilege_type, (obj->>'oid')::regtype, rec.grantee::regrole, case when rec.is_grantable then 'with grant option' else '' end));
434+
execute(format('grant %s on type %s to %s %s', rec.privilege_type, (obj->>'oid')::regtype, rec.grantee::regrole, case when rec.is_grantable then 'with grant option' else '' end));
435435
end loop;
436436
end loop;
437437
@@ -465,7 +465,7 @@ begin
465465
from aclexplode((obj->>'acl')::aclitem[])
466466
where grantee::regrole in ('postgres', 'supabase_admin')
467467
loop
468-
execute(format('grant %s on %s %s(%s) to %I %s'
468+
execute(format('grant %s on %s %s(%s) to %s %s'
469469
, rec.privilege_type
470470
, case
471471
when obj->>'kind' = 'p' then 'procedure'
@@ -504,7 +504,7 @@ begin
504504
from aclexplode((obj->>'acl')::aclitem[])
505505
where grantee::regrole in ('postgres', 'supabase_admin')
506506
loop
507-
execute(format('grant %s on table %s to %I %s', rec.privilege_type, (obj->>'oid')::oid::regclass, rec.grantee::regrole, case when rec.is_grantable then 'with grant option' else '' end));
507+
execute(format('grant %s on table %s to %s %s', rec.privilege_type, (obj->>'oid')::oid::regclass, rec.grantee::regrole, case when rec.is_grantable then 'with grant option' else '' end));
508508
end loop;
509509
end loop;
510510
end
@@ -513,7 +513,7 @@ $$;
513513
do $$
514514
begin
515515
if exists (select from pg_extension where extname = 'timescaledb') then
516-
execute(format('select %I.timescaledb_post_restore()', (select pronamespace::regnamespace from pg_proc where proname = 'timescaledb_post_restore')));
516+
execute(format('select %s.timescaledb_post_restore()', (select pronamespace::regnamespace from pg_proc where proname = 'timescaledb_post_restore')));
517517
end if;
518518
end
519519
$$;

0 commit comments

Comments
 (0)