diff options
author | Stephen Frost <sfrost@snowman.net> | 2016-05-24 20:10:16 -0400 |
---|---|---|
committer | Stephen Frost <sfrost@snowman.net> | 2016-05-24 20:10:16 -0400 |
commit | 2e8b4bf80473d0e4a4254b417424e79195a9ce6a (patch) | |
tree | d6e3dbaf63969ee5898dbe661e68f6bbd008cf23 /src/test | |
parent | 2d2e40e3befd8b9e0d2757554537345b15fa6ea2 (diff) | |
download | postgresql-2e8b4bf80473d0e4a4254b417424e79195a9ce6a.tar.gz postgresql-2e8b4bf80473d0e4a4254b417424e79195a9ce6a.zip |
Qualify table usage in dumpTable() and use regclass
All of the other tables used in the query in dumpTable(), which is
collecting column-level ACLs, are qualified, so we should be qualifying
the pg_init_privs, the related sub-select against pg_class and the
other queries added by the pg_dump catalog ACLs work.
Also, use ::regclass (or ::pg_catalog.regclass, where appropriate)
instead of using a poorly constructed query to get the OID for various
catalog tables.
Issues identified by Noah and Alvaro, patch by me.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/modules/test_pg_dump/t/001_base.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/modules/test_pg_dump/t/001_base.pl b/src/test/modules/test_pg_dump/t/001_base.pl index 9a65da1d6ae..2177df8bba4 100644 --- a/src/test/modules/test_pg_dump/t/001_base.pl +++ b/src/test/modules/test_pg_dump/t/001_base.pl @@ -340,9 +340,9 @@ my %tests = ( }, 'GRANT SELECT ON TABLE regress_pg_dump_table' => { regexp => qr/^ - \QSELECT binary_upgrade_set_record_init_privs(true);\E\n + \QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n \QGRANT SELECT ON TABLE regress_pg_dump_table TO dump_test;\E\n - \QSELECT binary_upgrade_set_record_init_privs(false);\E + \QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E $/xms, like => { binary_upgrade => 1, @@ -362,9 +362,9 @@ my %tests = ( }, 'GRANT SELECT(col1) ON regress_pg_dump_table' => { regexp => qr/^ - \QSELECT binary_upgrade_set_record_init_privs(true);\E\n + \QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n \QGRANT SELECT(col1) ON TABLE regress_pg_dump_table TO PUBLIC;\E\n - \QSELECT binary_upgrade_set_record_init_privs(false);\E + \QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E $/xms, like => { binary_upgrade => 1, |