diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2008-05-05 01:21:03 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2008-05-05 01:21:03 +0000 |
| commit | a87f15d50696aae8d17adddeec6b6ee7c07aeb05 (patch) | |
| tree | 6585d77d5252d163e417d184637eaca0bd207f86 /src | |
| parent | c0b1b01ef54f2d4891af8c3c611bc3c4ee0440c4 (diff) | |
| download | postgresql-a87f15d50696aae8d17adddeec6b6ee7c07aeb05.tar.gz postgresql-a87f15d50696aae8d17adddeec6b6ee7c07aeb05.zip | |
Display ACLS using multiple lines for psql's \z. Brendan Jurd.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/describe.c | 4 | ||||
| -rw-r--r-- | src/test/regress/expected/dependency.out | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 89a3f219615..97c3a82efeb 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.169 2008/05/05 00:11:31 adunstan Exp $ + * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.170 2008/05/05 01:21:03 adunstan Exp $ */ #include "postgres_fe.h" #include "describe.h" @@ -493,7 +493,7 @@ permissionsList(const char *pattern) "SELECT n.nspname as \"%s\",\n" " c.relname as \"%s\",\n" " CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'S' THEN '%s' END as \"%s\",\n" - " c.relacl as \"%s\"\n" + " pg_catalog.array_to_string(c.relacl, E'\\n') as \"%s\"\n" "FROM pg_catalog.pg_class c\n" " LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n" "WHERE c.relkind IN ('r', 'v', 'S')\n", diff --git a/src/test/regress/expected/dependency.out b/src/test/regress/expected/dependency.out index 82c1bf01383..6f62ce70108 100644 --- a/src/test/regress/expected/dependency.out +++ b/src/test/regress/expected/dependency.out @@ -68,19 +68,21 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "deptest_pkey" fo GRANT ALL ON deptest1 TO regression_user2; RESET SESSION AUTHORIZATION; \z deptest1 - Access privileges for database "regression" - Schema | Name | Type | Access privileges ---------+----------+-------+------------------------------------------------------------------------------------------------------------------------------------ - public | deptest1 | table | {regression_user0=arwdxt/regression_user0,regression_user1=a*r*w*d*x*t*/regression_user0,regression_user2=arwdxt/regression_user1} + Access privileges for database "regression" + Schema | Name | Type | Access privileges +--------+----------+-------+------------------------------------------------ + public | deptest1 | table | regression_user0=arwdxt/regression_user0 + : regression_user1=a*r*w*d*x*t*/regression_user0 + : regression_user2=arwdxt/regression_user1 (1 row) DROP OWNED BY regression_user1; -- all grants revoked \z deptest1 - Access privileges for database "regression" - Schema | Name | Type | Access privileges ---------+----------+-------+-------------------------------------------- - public | deptest1 | table | {regression_user0=arwdxt/regression_user0} + Access privileges for database "regression" + Schema | Name | Type | Access privileges +--------+----------+-------+------------------------------------------ + public | deptest1 | table | regression_user0=arwdxt/regression_user0 (1 row) -- table was dropped |