Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit461f957

Browse files
committed
[PGPRO-5673] cosmetic changes
1 parenta387803 commit461f957

File tree

6 files changed

+53
-75
lines changed

6 files changed

+53
-75
lines changed

‎.travis.yml

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,13 @@ notifications:
2626

2727
# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
2828
env:
29-
# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE
30-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE
31-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE
32-
# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE
33-
# - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
34-
# - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
35-
# - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
36-
37-
-PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=backup
38-
-PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=backup
39-
-PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
40-
-PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=backup
41-
-PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=backup
42-
-PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=backup
43-
-PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=backup
44-
-PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=restore
45-
-PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=restore
46-
-PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
47-
-PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=restore
48-
-PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=restore
49-
-PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=restore
50-
-PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=restore
51-
# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE MODE=ptrack
52-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE MODE=ptrack
53-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=ptrack
54-
# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE MODE=ptrack
55-
29+
-PG_VERSION=14 PG_BRANCH=REL_14_STABLE
30+
-PG_VERSION=13 PG_BRANCH=REL_13_STABLE
31+
-PG_VERSION=12 PG_BRANCH=REL_12_STABLE
32+
-PG_VERSION=11 PG_BRANCH=REL_11_STABLE
33+
-PG_VERSION=10 PG_BRANCH=REL_10_STABLE
34+
-PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
35+
-PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
5636
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=archive
5737
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
5838
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=compression
@@ -68,7 +48,6 @@ env:
6848
jobs:
6949
allow_failures:
7050
-if:env(PG_BRANCH) = master
71-
-if:env(PG_BRANCH) = REL9_5_STABLE
7251
# - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
7352

7453
# Only run CI for master branch commits to limit our travis usage

‎doc/pgprobackup.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@ BEGIN;
606606
CREATE ROLE backup WITH LOGIN;
607607
GRANT USAGE ON SCHEMA pg_catalog TO backup;
608608
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
609+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
609610
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
610611
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean) TO backup;
611612
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup() TO backup;
@@ -614,8 +615,6 @@ GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_xlog() TO backup;
614615
GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() TO backup;
615616
GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup;
616617
GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;
617-
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
618-
GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup;
619618
COMMIT;
620619
</programlisting>
621620
<para>
@@ -626,6 +625,7 @@ BEGIN;
626625
CREATE ROLE backup WITH LOGIN;
627626
GRANT USAGE ON SCHEMA pg_catalog TO backup;
628627
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
628+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
629629
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
630630
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup;
631631
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup(boolean) TO backup;
@@ -636,8 +636,6 @@ GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() TO backup;
636636
GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup;
637637
GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;
638638
GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_checkpoint() TO backup;
639-
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
640-
GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup;
641639
COMMIT;
642640
</programlisting>
643641
<para>
@@ -648,6 +646,7 @@ BEGIN;
648646
CREATE ROLE backup WITH LOGIN;
649647
GRANT USAGE ON SCHEMA pg_catalog TO backup;
650648
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
649+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
651650
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
652651
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup;
653652
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup(boolean, boolean) TO backup;
@@ -658,8 +657,6 @@ GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() TO backup;
658657
GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup;
659658
GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;
660659
GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_checkpoint() TO backup;
661-
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
662-
GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup;
663660
COMMIT;
664661
</programlisting>
665662
<para>
@@ -5537,6 +5534,7 @@ BEGIN;
55375534
CREATE ROLE backup WITH LOGIN REPLICATION;
55385535
GRANT USAGE ON SCHEMA pg_catalog TO backup;
55395536
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
5537+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
55405538
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
55415539
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup;
55425540
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup(boolean, boolean) TO backup;
@@ -5547,8 +5545,6 @@ GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() TO backup;
55475545
GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup;
55485546
GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;
55495547
GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_checkpoint() TO backup;
5550-
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
5551-
GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup;
55525548
COMMIT;
55535549
</programlisting>
55545550
</step>

‎tests/backup.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2020,17 +2020,17 @@ def test_backup_with_least_privileges_role(self):
20202020
"GRANT SELECT ON TABLE pg_catalog.pg_proc TO backup; "
20212021
"GRANT SELECT ON TABLE pg_catalog.pg_extension TO backup; "
20222022
"GRANT SELECT ON TABLE pg_catalog.pg_database TO backup; "# for partial restore, checkdb and ptrack
2023+
"GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup; "
20232024
"GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; "
20242025
"GRANT EXECUTE ON FUNCTION pg_catalog.textout(text) TO backup; "
20252026
"GRANT EXECUTE ON FUNCTION pg_catalog.timestamptz(timestamp with time zone, integer) TO backup; "
20262027
"GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; "
2028+
"GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; "
20272029
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; "
20282030
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean) TO backup; "
20292031
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup() TO backup; "
20302032
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
2031-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup; "
2032-
"GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; "
2033-
"GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup;"
2033+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
20342034
)
20352035
# PG 9.6
20362036
elifself.get_version(node)>90600andself.get_version(node)<100000:
@@ -2055,10 +2055,12 @@ def test_backup_with_least_privileges_role(self):
20552055
"GRANT SELECT ON TABLE pg_catalog.pg_extension TO backup; "
20562056
"GRANT SELECT ON TABLE pg_catalog.pg_proc TO backup; "
20572057
"GRANT SELECT ON TABLE pg_catalog.pg_database TO backup; "# for partial restore, checkdb and ptrack
2058+
"GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup; "
20582059
"GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; "
20592060
"GRANT EXECUTE ON FUNCTION pg_catalog.textout(text) TO backup; "
20602061
"GRANT EXECUTE ON FUNCTION pg_catalog.timestamptz(timestamp with time zone, integer) TO backup; "
20612062
"GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; "
2063+
"GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; "
20622064
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; "
20632065
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; "
20642066
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup; "
@@ -2067,9 +2069,7 @@ def test_backup_with_least_privileges_role(self):
20672069
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_xlog() TO backup; "
20682070
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
20692071
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
2070-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup; "
2071-
"GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; "
2072-
"GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup;"
2072+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
20732073
)
20742074
# >= 10
20752075
else:
@@ -2095,8 +2095,10 @@ def test_backup_with_least_privileges_role(self):
20952095
"GRANT SELECT ON TABLE pg_catalog.pg_proc TO backup; "
20962096
"GRANT SELECT ON TABLE pg_catalog.pg_extension TO backup; "
20972097
"GRANT SELECT ON TABLE pg_catalog.pg_database TO backup; "# for partial restore, checkdb and ptrack
2098+
"GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup; "
20982099
"GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; "
20992100
"GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; "
2101+
"GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; "
21002102
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; "
21012103
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; "
21022104
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup; "
@@ -2105,9 +2107,7 @@ def test_backup_with_least_privileges_role(self):
21052107
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup; "
21062108
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
21072109
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
2108-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup; "
2109-
"GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; "
2110-
"GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup;"
2110+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
21112111
)
21122112

21132113
ifself.ptrack:
@@ -3321,7 +3321,7 @@ def test_missing_replication_permission_1(self):
33213321
ifself.get_version(node)<90600:
33223322
node.safe_psql(
33233323
'backupdb',
3324-
"CREATE ROLE backup WITH LOGIN REPLICATION; "
3324+
"CREATE ROLE backup WITH LOGIN; "
33253325
"GRANT CONNECT ON DATABASE backupdb to backup; "
33263326
"GRANT USAGE ON SCHEMA pg_catalog TO backup; "
33273327
"GRANT SELECT ON TABLE pg_catalog.pg_proc TO backup; "
@@ -3335,7 +3335,8 @@ def test_missing_replication_permission_1(self):
33353335
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean) TO backup; "
33363336
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup() TO backup; "
33373337
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
3338-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
3338+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3339+
)
33393340
# PG 9.6
33403341
elifself.get_version(node)>90600andself.get_version(node)<100000:
33413342
node.safe_psql(
@@ -3358,7 +3359,8 @@ def test_missing_replication_permission_1(self):
33583359
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_xlog() TO backup; "
33593360
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
33603361
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
3361-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
3362+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3363+
)
33623364
# >= 10
33633365
else:
33643366
node.safe_psql(
@@ -3380,7 +3382,8 @@ def test_missing_replication_permission_1(self):
33803382
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup; "
33813383
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
33823384
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
3383-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
3385+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3386+
)
33843387

33853388
ifProbackupTest.enterprise:
33863389
node.safe_psql(

‎tests/checkdb.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -562,14 +562,14 @@ def test_checkdb_with_least_privileges(self):
562562
'GRANT SELECT ON TABLE pg_catalog.pg_index TO backup; '
563563
'GRANT SELECT ON TABLE pg_catalog.pg_namespace TO backup; '
564564
'GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; '
565+
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; '
565566
'GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; '
566567
'GRANT EXECUTE ON FUNCTION pg_catalog.namene(name, name) TO backup; '
567568
'GRANT EXECUTE ON FUNCTION pg_catalog.int8(integer) TO backup; '
568569
'GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup; '
569570
'GRANT EXECUTE ON FUNCTION pg_catalog.charne("char", "char") TO backup; '
570571
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; '
571-
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup; '# amcheck-next function
572-
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;'
572+
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'# amcheck-next function
573573
)
574574
# PG 9.6
575575
elifself.get_version(node)>90600andself.get_version(node)<100000:
@@ -587,6 +587,7 @@ def test_checkdb_with_least_privileges(self):
587587
'GRANT SELECT ON TABLE pg_catalog.pg_index TO backup; '
588588
'GRANT SELECT ON TABLE pg_catalog.pg_namespace TO backup; '
589589
'GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; '
590+
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; '
590591
'GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; '
591592
'GRANT EXECUTE ON FUNCTION pg_catalog.namene(name, name) TO backup; '
592593
'GRANT EXECUTE ON FUNCTION pg_catalog.int8(integer) TO backup; '
@@ -595,8 +596,7 @@ def test_checkdb_with_least_privileges(self):
595596
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; '
596597
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; '
597598
# 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
598-
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup; '
599-
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;'
599+
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
600600
)
601601
# PG 10
602602
elifself.get_version(node)>100000andself.get_version(node)<110000:
@@ -614,15 +614,15 @@ def test_checkdb_with_least_privileges(self):
614614
'GRANT SELECT ON TABLE pg_catalog.pg_index TO backup; '
615615
'GRANT SELECT ON TABLE pg_catalog.pg_namespace TO backup; '
616616
'GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; '
617+
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; '
617618
'GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; '
618619
'GRANT EXECUTE ON FUNCTION pg_catalog.namene(name, name) TO backup; '
619620
'GRANT EXECUTE ON FUNCTION pg_catalog.int8(integer) TO backup; '
620621
'GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup; '
621622
'GRANT EXECUTE ON FUNCTION pg_catalog.charne("char", "char") TO backup; '
622623
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; '
623624
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; '
624-
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
625-
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;'
625+
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup;'
626626
)
627627
# >= 11
628628
else:
@@ -640,6 +640,7 @@ def test_checkdb_with_least_privileges(self):
640640
'GRANT SELECT ON TABLE pg_catalog.pg_index TO backup; '
641641
'GRANT SELECT ON TABLE pg_catalog.pg_namespace TO backup; '
642642
'GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; '
643+
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup; '
643644
'GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; '
644645
'GRANT EXECUTE ON FUNCTION pg_catalog.namene(name, name) TO backup; '
645646
'GRANT EXECUTE ON FUNCTION pg_catalog.int8(integer) TO backup; '
@@ -648,8 +649,7 @@ def test_checkdb_with_least_privileges(self):
648649
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; '
649650
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; '
650651
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
651-
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup; '
652-
'GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;'
652+
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
653653
)
654654

655655
ifProbackupTest.enterprise:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp