Index: src/bin/psql/describe.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/psql/describe.c,v
retrieving revision 1.133
diff -c -r1.133 describe.c
*** src/bin/psql/describe.c	5 Mar 2006 15:58:51 -0000	1.133
--- src/bin/psql/describe.c	30 Mar 2006 00:23:57 -0000
***************
*** 362,375 ****
  			",\n       pg_catalog.pg_encoding_to_char(d.encoding) as \"%s\"",
  					  _("Encoding"));
  	if (verbose)
  		appendPQExpBuffer(&buf,
  						  ",\n       pg_catalog.shobj_description(d.oid, 'pg_database') as \"%s\"",
  						  _("Description"));
  	appendPQExpBuffer(&buf,
  					  "\nFROM pg_catalog.pg_database d"
! 				  "\n  JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n"
! 					  "ORDER BY 1;");
! 
  	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
--- 362,382 ----
  			",\n       pg_catalog.pg_encoding_to_char(d.encoding) as \"%s\"",
  					  _("Encoding"));
  	if (verbose)
+ 	{
  		appendPQExpBuffer(&buf,
  						  ",\n       pg_catalog.shobj_description(d.oid, 'pg_database') as \"%s\"",
  						  _("Description"));
+ 		appendPQExpBuffer(&buf,
+ 						  ",\n       t.spcname as \"%s\"",
+ 						  _("Tablespace"));
+ 	}
  	appendPQExpBuffer(&buf,
  					  "\nFROM pg_catalog.pg_database d"
! 				  "\n  JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n");
! 	if (verbose)
! 		appendPQExpBuffer(&buf,
! 					"  JOIN pg_catalog.pg_tablespace t on d.dattablespace = t.oid\n");	
! 	appendPQExpBuffer(&buf,"ORDER BY 1;");
  	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)