|
3 | 3 | * |
4 | 4 | * Copyright (c) 2000-2006, PostgreSQL Global Development Group |
5 | 5 | * |
6 | | - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.133 2006/03/0515:58:51 momjian Exp $ |
| 6 | + * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.134 2006/04/26 23:15:45 momjian Exp $ |
7 | 7 | */ |
8 | 8 | #include"postgres_fe.h" |
9 | 9 | #include"describe.h" |
@@ -362,14 +362,21 @@ listAllDbs(bool verbose) |
362 | 362 | ",\n pg_catalog.pg_encoding_to_char(d.encoding) as \"%s\"", |
363 | 363 | _("Encoding")); |
364 | 364 | if (verbose) |
| 365 | +{ |
| 366 | +appendPQExpBuffer(&buf, |
| 367 | +",\n t.spcname as \"%s\"", |
| 368 | +_("Tablespace")); |
365 | 369 | appendPQExpBuffer(&buf, |
366 | 370 | ",\n pg_catalog.shobj_description(d.oid, 'pg_database') as \"%s\"", |
367 | 371 | _("Description")); |
| 372 | +} |
368 | 373 | appendPQExpBuffer(&buf, |
369 | 374 | "\nFROM pg_catalog.pg_database d" |
370 | | -"\n JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n" |
371 | | -"ORDER BY 1;"); |
372 | | - |
| 375 | +"\n JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n"); |
| 376 | +if (verbose) |
| 377 | +appendPQExpBuffer(&buf, |
| 378 | +" JOIN pg_catalog.pg_tablespace t on d.dattablespace = t.oid\n"); |
| 379 | +appendPQExpBuffer(&buf,"ORDER BY 1;"); |
373 | 380 | res=PSQLexec(buf.data, false); |
374 | 381 | termPQExpBuffer(&buf); |
375 | 382 | if (!res) |
|