From ab6e4ea3dc644046ddc487799e78dd4018d7a723 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Mon, 23 Feb 1998 19:26:36 +0000 Subject: Modify initdb.sh so that it makes pg_user readable through view db_user Modify psql so that it uses db_user instead of pg_user GRANT SELECT on pg_class --- src/bin/psql/psql.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/bin/psql/psql.c') diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index 54905c31c74..92d29f0776f 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.133 1998/02/07 06:11:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.134 1998/02/23 19:26:36 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -333,7 +333,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type, listbuf[0] = '\0'; strcat(listbuf, "SELECT usename, relname, relkind, relhasrules "); - strcat(listbuf, "FROM pg_class, pg_user "); + strcat(listbuf, "FROM pg_class, db_user "); switch (info_type) { case 't': @@ -351,9 +351,9 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type, break; } if (!system_tables) - strcat(listbuf, " and relname !~ '^pg_'"); + strcat(listbuf, " and relname !~ '^[dp][bg]_'"); else - strcat(listbuf, " and relname ~ '^pg_'"); + strcat(listbuf, " and relname ~ '^[dp][bg]_'"); strcat(listbuf, " and relname !~ '^xin[vx][0-9]+'"); /* @@ -492,9 +492,9 @@ rightsList(PsqlSettings *pset) listbuf[0] = '\0'; strcat(listbuf, "SELECT relname, relacl "); - strcat(listbuf, "FROM pg_class, pg_user "); + strcat(listbuf, "FROM pg_class, db_user "); strcat(listbuf, "WHERE ( relkind = 'r' OR relkind = 'i' OR relkind = 'S') "); - strcat(listbuf, " and relname !~ '^pg_'"); + strcat(listbuf, " and relname !~ '^[dp][bg]_'"); strcat(listbuf, " and relname !~ '^xin[vx][0-9]+'"); strcat(listbuf, " and usesysid = relowner"); strcat(listbuf, " ORDER BY relname "); -- cgit v1.2.3