77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.149 1998/07/26 01: 18:07 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.150 1998/08/04 18:29:41 momjian Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -408,12 +408,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,
408408strcat (listbuf ," and relname !~ '^pg_'" );
409409else
410410strcat (listbuf ," and relname ~ '^pg_'" );
411- strcat (listbuf ," and relname !~ '^xin[vx][0-9]+'" );
412-
413- /*
414- * the usesysid = relowner won't work on stock 1.0 dbs, need to add in
415- * the int4oideq function
416- */
411+ strcat (listbuf ," and relname !~ '^xin[vx][0-9]+'" );
417412strcat (listbuf ," and usesysid = relowner" );
418413strcat (listbuf ," ORDER BY relname " );
419414if (!(res = PSQLexec (pset ,listbuf )))
@@ -595,6 +590,7 @@ rightsList(PsqlSettings *pset)
595590}
596591else
597592{
593+ PQclear (res );
598594fprintf (stderr ,"Couldn't find any tables!\n" );
599595return -1 ;
600596}
611607tableDesc (PsqlSettings * pset ,char * table ,FILE * fout )
612608{
613609char descbuf [512 ];
614- int nColumns ;
610+ int nColumns , nIndices ;
615611char * rtype ;
616612char * rnotnull ;
617613char * rhasdef ;
@@ -765,6 +761,40 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout)
765761}
766762fprintf (fout ,"+----------------------------------+----------------------------------+-------+\n" );
767763PQclear (res );
764+
765+ /* display defined indexes for this table */
766+ descbuf [0 ]= '\0' ;
767+ strcat (descbuf ,"SELECT c2.relname " );
768+ strcat (descbuf ,"FROM pg_class c, pg_class c2, pg_index i " );
769+ strcat (descbuf ,"WHERE c.relname = '" );
770+ strcat (descbuf ,table );
771+ strcat (descbuf ,"'" );
772+ strcat (descbuf ," and c.oid = i.indrelid " );
773+ strcat (descbuf ," and i.indexrelid = c2.oid " );
774+ strcat (descbuf ," ORDER BY c2.relname " );
775+ if ((res = PSQLexec (pset ,descbuf )))
776+ {
777+ nIndices = PQntuples (res );
778+ if (nIndices > 0 )
779+ {
780+ /*
781+ * Display the information
782+ */
783+
784+ if (nIndices == 1 )
785+ fprintf (fout ,"Indices: " );
786+ else
787+ fprintf (fout ,"Index: " );
788+
789+ /* next, print out the instances */
790+ for (i = 0 ;i < PQntuples (res );i ++ )
791+ if (i == 0 )
792+ fprintf (fout ,"%s\n" ,PQgetvalue (res ,i ,0 ));
793+ else
794+ fprintf (fout ," %s\n" ,PQgetvalue (res ,i ,0 ));
795+ }
796+ PQclear (res );
797+ }
768798if (usePipe )
769799{
770800pclose (fout );
@@ -774,6 +804,7 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout)
774804}
775805else
776806{
807+ PQclear (res );
777808fprintf (stderr ,"Couldn't find table %s!\n" ,table );
778809return -1 ;
779810}