Commit 71ec58e7 authored by Peter Eisentraut's avatar Peter Eisentraut

Resolve gratuitous tabs in test SQL file

parent 28c16f49
...@@ -17,7 +17,7 @@ CREATE OR REPLACE FUNCTION chksetconfig() ...@@ -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'); ...@@ -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"; ...@@ -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"; ...@@ -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
----------+--------------------------------------- ----------+---------------------------------------
......
...@@ -18,7 +18,7 @@ CREATE OR REPLACE FUNCTION chksetconfig() ...@@ -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"'); ...@@ -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"; ...@@ -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"; ...@@ -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_';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment