77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.134 1998/02/23 19:26 :36 scrappy Exp $
10+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.135 1998/02/25 14:50 :36 scrappy Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -333,7 +333,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
333333
334334listbuf [0 ]= '\0' ;
335335strcat (listbuf ,"SELECT usename, relname, relkind, relhasrules " );
336- strcat (listbuf ,"FROM pg_class,db_user " );
336+ strcat (listbuf ,"FROM pg_class,pg_user " );
337337switch (info_type )
338338{
339339case 't' :
@@ -351,9 +351,9 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
351351break ;
352352}
353353if (!system_tables )
354- strcat (listbuf ," and relname !~ '^[dp][bg]_ '" );
354+ strcat (listbuf ," and relname !~ '^pg_ '" );
355355else
356- strcat (listbuf ," and relname ~ '^[dp][bg]_ '" );
356+ strcat (listbuf ," and relname ~ '^pg_ '" );
357357strcat (listbuf ," and relname !~ '^xin[vx][0-9]+'" );
358358
359359/*
@@ -492,9 +492,9 @@ rightsList(PsqlSettings *pset)
492492
493493listbuf [0 ]= '\0' ;
494494strcat (listbuf ,"SELECT relname, relacl " );
495- strcat (listbuf ,"FROM pg_class,db_user " );
495+ strcat (listbuf ,"FROM pg_class,pg_user " );
496496strcat (listbuf ,"WHERE ( relkind = 'r' OR relkind = 'i' OR relkind = 'S') " );
497- strcat (listbuf ," and relname !~ '^[dp][bg]_ '" );
497+ strcat (listbuf ," and relname !~ '^pg_ '" );
498498strcat (listbuf ," and relname !~ '^xin[vx][0-9]+'" );
499499strcat (listbuf ," and usesysid = relowner" );
500500strcat (listbuf ," ORDER BY relname " );