|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.71 1997/06/0601:41:24 scrappy Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.72 1997/06/0622:05:23 scrappy Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -250,8 +250,8 @@ tableList(PsqlSettings * ps, bool deep_tablelist, char table_index_both) |
250 | 250 | default:strcat(listbuf,"WHERE ( relkind = 'r' OR relkind = 'i') "); |
251 | 251 | break; |
252 | 252 | } |
253 | | -strcat(listbuf," and relname !~ '^pg_'"); |
254 | | -strcat(listbuf," and relname !~ '^Inv[0-9]+'"); |
| 253 | +strcat(listbuf," and relname !~ '^pg_'"); |
| 254 | +strcat(listbuf," and relname !~ '^xin[vx][0-9]+'"); |
255 | 255 | /* |
256 | 256 | * the usesysid = relowner won't work on stock 1.0 dbs, need to add in |
257 | 257 | * the int4oideq function |
@@ -341,7 +341,7 @@ rightsList(PsqlSettings * ps) |
341 | 341 | strcat(listbuf," FROM pg_class, pg_user "); |
342 | 342 | strcat(listbuf,"WHERE ( relkind = 'r' OR relkind = 'i') "); |
343 | 343 | strcat(listbuf," and relname !~ '^pg_'"); |
344 | | -strcat(listbuf," and relname !~ '^Inv[0-9]+'"); |
| 344 | +strcat(listbuf," and relname !~ '^xin[vx][0-9]+'"); |
345 | 345 | strcat(listbuf," and usesysid = relowner"); |
346 | 346 | strcat(listbuf," ORDER BY relname "); |
347 | 347 | if (!(res=PSQLexec(ps,listbuf))) |
@@ -1174,9 +1174,9 @@ HandleSlashCmds(PsqlSettings * settings, |
1174 | 1174 | case'd':/* \d describe tables or columns in a table */ |
1175 | 1175 | if (strncmp(cmd,"dt",2)==0) {/* only tables */ |
1176 | 1176 | tableList(settings,0,'t'); |
1177 | | - }elseif (strncmp(cmd,"di",2)==0) {/* onlytables */ |
| 1177 | + }elseif (strncmp(cmd,"di",2)==0) {/* onlyindicies */ |
1178 | 1178 | tableList(settings,0,'i'); |
1179 | | - }elseif (!optarg) {/* show'em both */ |
| 1179 | + }elseif (!optarg) {/* show tables and indicies */ |
1180 | 1180 | tableList(settings,0,'b'); |
1181 | 1181 | }elseif (strcmp(optarg,"*")==0) {/* show everything */ |
1182 | 1182 | tableList(settings,0,'b'); |
|