|
3 | 3 | * |
4 | 4 | * Copyright (c) 2000-2008, PostgreSQL Global Development Group |
5 | 5 | * |
6 | | - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.168 2008/05/02 10:16:16 heikki Exp $ |
| 6 | + * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.169 2008/05/05 00:11:31 adunstan Exp $ |
7 | 7 | */ |
8 | 8 | #include"postgres_fe.h" |
9 | 9 | #include"describe.h" |
@@ -307,11 +307,22 @@ describeTypes(const char *pattern, bool verbose) |
307 | 307 | " WHEN t.typlen < 0\n" |
308 | 308 | " THEN CAST('var' AS pg_catalog.text)\n" |
309 | 309 | " ELSE CAST(t.typlen AS pg_catalog.text)\n" |
310 | | -" END AS \"%s\",\n", |
| 310 | +" END AS \"%s\",\n" |
| 311 | +" pg_catalog.array_to_string(\n" |
| 312 | +" ARRAY(\n" |
| 313 | +" SELECT e.enumlabel\n" |
| 314 | +" FROM pg_catalog.pg_enum e\n" |
| 315 | +" WHERE e.enumtypid = t.oid\n" |
| 316 | +" ORDER BY e.oid\n" |
| 317 | +" ),\n" |
| 318 | +" E'\\n'\n" |
| 319 | +" ) AS \"%s\",\n", |
311 | 320 | gettext_noop("Internal name"), |
312 | | -gettext_noop("Size")); |
| 321 | +gettext_noop("Size"), |
| 322 | +gettext_noop("Elements")); |
| 323 | + |
313 | 324 | appendPQExpBuffer(&buf, |
314 | | -" pg_catalog.obj_description(t.oid, 'pg_type') as \"%s\"\n", |
| 325 | +" pg_catalog.obj_description(t.oid, 'pg_type') as \"%s\"\n", |
315 | 326 | gettext_noop("Description")); |
316 | 327 |
|
317 | 328 | appendPQExpBuffer(&buf,"FROM pg_catalog.pg_type t\n" |
|