|
3 | 3 | * |
4 | 4 | * Copyright (c) 2000-2007, PostgreSQL Global Development Group |
5 | 5 | * |
6 | | - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.152 2007/02/20 10:23:38 petere Exp $ |
| 6 | + * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.153 2007/03/16 08:28:01 mha Exp $ |
7 | 7 | */ |
8 | 8 | #include"postgres_fe.h" |
9 | 9 | #include"describe.h" |
@@ -62,21 +62,22 @@ describeAggregates(const char *pattern, bool verbose) |
62 | 62 | printfPQExpBuffer(&buf, |
63 | 63 | "SELECT n.nspname as \"%s\",\n" |
64 | 64 | " p.proname AS \"%s\",\n" |
| 65 | +" pg_catalog.format_type(p.prorettype, NULL) AS \"%s\",\n" |
65 | 66 | " CASE WHEN p.pronargs = 0\n" |
66 | 67 | " THEN CAST('*' AS pg_catalog.text)\n" |
67 | 68 | " ELSE\n" |
68 | 69 | " pg_catalog.array_to_string(ARRAY(\n" |
69 | 70 | " SELECT\n" |
70 | | -" pg_catalog.format_type(p.proargtypes[s.i], NULL)\n" |
| 71 | +" pg_catalog.format_type(p.proargtypes[s.i], NULL)\n" |
71 | 72 | " FROM\n" |
72 | 73 | " pg_catalog.generate_series(0, pg_catalog.array_upper(p.proargtypes, 1)) AS s(i)\n" |
73 | 74 | " ), ', ')\n" |
74 | 75 | " END AS \"%s\",\n" |
75 | | -" pg_catalog.obj_description(p.oid, 'pg_proc') as \"%s\"\n" |
| 76 | +" pg_catalog.obj_description(p.oid, 'pg_proc') as \"%s\"\n" |
76 | 77 | "FROM pg_catalog.pg_proc p\n" |
77 | | -" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace\n" |
| 78 | +" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace\n" |
78 | 79 | "WHERE p.proisagg\n", |
79 | | -_("Schema"),_("Name"), |
| 80 | +_("Schema"),_("Name"),_("Result data type"), |
80 | 81 | _("Argument data types"),_("Description")); |
81 | 82 |
|
82 | 83 | processSQLNamePattern(pset.db,&buf,pattern, true, false, |
|