database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 03:21:24 +03:00
Code

Resolve gratuitous tabs in test SQL file

Browse Source
This commit is contained in:
Peter Eisentraut 2020-07-07 10:21:54 +02:00
parent 28c16f4947
commit 71ec58e7fc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/modules/unsafe_tests/expected/rolenames.out
View File

@ -17,7 +17,7 @@ CREATE OR REPLACE FUNCTION chksetconfig()
RETURNS TABLE (db name, "role" name, rolkeyword text, setconfig text[]) RETURNS TABLE (db name, "role" name, rolkeyword text, setconfig text[])
AS $$ AS $$
SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'), 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 FROM pg_db_role_setting s
LEFT JOIN pg_roles r ON (r.oid = s.setrole) LEFT JOIN pg_roles r ON (r.oid = s.setrole)
LEFT JOIN pg_database d ON (d.oid = s.setdatabase) LEFT JOIN pg_database d ON (d.oid = s.setdatabase)
@ -641,12 +641,12 @@ CREATE USER MAPPING FOR PUBLIC SERVER sv6 OPTIONS (user 'PUBLIC');
CREATE USER MAPPING FOR "Public" SERVER sv7 OPTIONS (user '"Public"'); 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 regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');
CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9 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" ERROR: syntax error at or near "CURRENT_ROLE"
LINE 1: CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9 LINE 1: CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9
^ ^
CREATE USER MAPPING FOR nonexistent SERVER sv9 CREATE USER MAPPING FOR nonexistent SERVER sv9
OPTIONS (user 'nonexistent'); -- error; OPTIONS (user 'nonexistent'); -- error;
ERROR: role "nonexistent" does not exist ERROR: role "nonexistent" does not exist
SELECT * FROM chkumapping(); SELECT * FROM chkumapping();
umname | umserver | umoptions umname | umserver | umoptions
@ -860,7 +860,7 @@ GRANT ALL PRIVILEGES ON FUNCTION testagg5(int2) TO "Public";
GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx; GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx;
GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public"; GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public";
GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2) 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_'; SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
proname | proacl proname | proacl
----------+----------------------------------------------------------------------------------------------------------------------------------- ----------+-----------------------------------------------------------------------------------------------------------------------------------
@ -913,7 +913,7 @@ REVOKE ALL PRIVILEGES ON FUNCTION testagg5(int2) FROM "Public";
REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx; REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx;
REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public"; REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public";
REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2) 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_'; SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
proname | proacl proname | proacl
----------+--------------------------------------- ----------+---------------------------------------

10
src/test/modules/unsafe_tests/sql/rolenames.sql
View File

@ -18,7 +18,7 @@ CREATE OR REPLACE FUNCTION chksetconfig()
RETURNS TABLE (db name, "role" name, rolkeyword text, setconfig text[]) RETURNS TABLE (db name, "role" name, rolkeyword text, setconfig text[])
AS $$ AS $$
SELECT COALESCE(d.datname, 'ALL'), COALESCE(r.rolname, 'ALL'), 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 FROM pg_db_role_setting s
LEFT JOIN pg_roles r ON (r.oid = s.setrole) LEFT JOIN pg_roles r ON (r.oid = s.setrole)
LEFT JOIN pg_database d ON (d.oid = s.setdatabase) LEFT JOIN pg_database d ON (d.oid = s.setdatabase)
@ -312,9 +312,9 @@ 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 regress_testrolx SERVER sv8 OPTIONS (user 'regress_testrolx');
CREATE USER MAPPING FOR CURRENT_ROLE SERVER sv9 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 CREATE USER MAPPING FOR nonexistent SERVER sv9
OPTIONS (user 'nonexistent'); -- error; OPTIONS (user 'nonexistent'); -- error;
SELECT * FROM chkumapping(); SELECT * FROM chkumapping();
@ -416,7 +416,7 @@ GRANT ALL PRIVILEGES ON FUNCTION testagg5(int2) TO "Public";
GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx; GRANT ALL PRIVILEGES ON FUNCTION testagg6(int2) TO regress_testrolx;
GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public"; GRANT ALL PRIVILEGES ON FUNCTION testagg7(int2) TO "public";
GRANT ALL PRIVILEGES ON FUNCTION testagg8(int2) 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_'; SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
@ -435,7 +435,7 @@ REVOKE ALL PRIVILEGES ON FUNCTION testagg5(int2) FROM "Public";
REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx; REVOKE ALL PRIVILEGES ON FUNCTION testagg6(int2) FROM regress_testrolx;
REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public"; REVOKE ALL PRIVILEGES ON FUNCTION testagg7(int2) FROM "public";
REVOKE ALL PRIVILEGES ON FUNCTION testagg8(int2) 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_'; SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';