git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/test/modules/unsafe_tests/expected/rolenames.out b/src/test/modules/unsafe_tests/expected/rolenames.out

index b9ba8a350983e48eaff3f57e6301e569642dcde4..116d12ee71dc0acf922b637bc4be03e9b8b5a3fd 100644 (file)

--- a/src/test/modules/unsafe_tests/expected/rolenames.out

+++ b/src/test/modules/unsafe_tests/expected/rolenames.out

RETURNS TABLE (db name, "role" name, rolkeyword text, setconfig text[])

AS $$

SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'),

- COALESCE(v.keyword, '-'), s.setconfig

+ COALESCE(v.keyword, '-'), s.setconfig

FROM pg_db_role_setting s

LEFT JOIN pg_roles r ON (r.oid = s.setrole)

LEFT JOIN pg_database d ON (d.oid = s.setdatabase)

CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"');

CREATE USER MAPPING FOR regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');

CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9

- OPTIONS (user 'CURRENT_ROLE'); -- error

+ OPTIONS (user 'CURRENT_ROLE'); -- error

ERROR: syntax error at or near "CURRENT_ROLE"

LINE 1: CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9

^

CREATE USER MAPPING FOR nonexistent SERVER sv9

- OPTIONS (user 'nonexistent'); -- error;

+ OPTIONS (user 'nonexistent'); -- error;

ERROR: role "nonexistent" does not exist

SELECT * FROM chkumapping();

umname | umserver | umoptions

GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx;

GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public";

GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2)

- TO current_user, public, regress_testrolx;

+ TO current_user, public, regress_testrolx;

SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';

proname | proacl

----------+-----------------------------------------------------------------------------------------------------------------------------------

REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx;

REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public";

REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2)

- FROM current_user, public, regress_testrolx;

+ FROM current_user, public, regress_testrolx;

SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';

proname | proacl

----------+---------------------------------------

diff --git a/src/test/modules/unsafe_tests/sql/rolenames.sql b/src/test/modules/unsafe_tests/sql/rolenames.sql

index 0e60a79f65cc5d625ed710a91e7205be1674fb2a..c931b8ebee26ce5aa46a03bfaa8b62a9990070f7 100644 (file)

--- a/src/test/modules/unsafe_tests/sql/rolenames.sql

+++ b/src/test/modules/unsafe_tests/sql/rolenames.sql

RETURNS TABLE (db name, "role" name, rolkeyword text, setconfig text[])

AS $$

SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'),

- COALESCE(v.keyword, '-'), s.setconfig

+ COALESCE(v.keyword, '-'), s.setconfig

FROM pg_db_role_setting s

LEFT JOIN pg_roles r ON (r.oid = s.setrole)

LEFT JOIN pg_database d ON (d.oid = s.setdatabase)

CREATE USER MAPPING FOR regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');

CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9

- OPTIONS (user 'CURRENT_ROLE'); -- error

+ OPTIONS (user 'CURRENT_ROLE'); -- error

CREATE USER MAPPING FOR nonexistent SERVER sv9

- OPTIONS (user 'nonexistent'); -- error;

+ OPTIONS (user 'nonexistent'); -- error;

SELECT * FROM chkumapping();

GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx;

GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public";

GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2)

- TO current_user, public, regress_testrolx;

+ TO current_user, public, regress_testrolx;

SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';

REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx;

REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public";

REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2)

- FROM current_user, public, regress_testrolx;

+ FROM current_user, public, regress_testrolx;

SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';