database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-12 16:21:30 +03:00
Code

Code review for \df rewrite: fix assorted bugs, make type and

Browse Source 
volatility columns localizable.
This commit is contained in:
Tom Lane 2009-05-05 02:29:06 +00:00
parent 0e19884838
commit 9f4e9bfa9b
1 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/bin/psql/describe.c
View File

@ -8,7 +8,7 @@
* *
* Copyright (c) 2000-2009, PostgreSQL Global Development Group * Copyright (c) 2000-2009, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.211 2009/05/04 17:31:35 heikki Exp $ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.212 2009/05/05 02:29:06 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -201,10 +201,11 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
bool showNormal = strchr(functypes, 'n') != NULL; bool showNormal = strchr(functypes, 'n') != NULL;
bool showTrigger = strchr(functypes, 't') != NULL; bool showTrigger = strchr(functypes, 't') != NULL;
bool showWindow = strchr(functypes, 'w') != NULL; bool showWindow = strchr(functypes, 'w') != NULL;
bool have_where;
PQExpBufferData buf; PQExpBufferData buf;
PGresult *res; PGresult *res;
printQueryOpt myopt = pset.popt; printQueryOpt myopt = pset.popt;
static const bool translate_columns[] = {false, false, false, false, true, true, false, false, false, false};
if (strlen(functypes) != strspn(functypes, "antwS+")) if (strlen(functypes) != strspn(functypes, "antwS+"))
{ {
@ -241,7 +242,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
" CASE\n" " CASE\n"
" WHEN p.proisagg THEN '%s'\n" " WHEN p.proisagg THEN '%s'\n"
" WHEN p.proiswindow THEN '%s'\n" " WHEN p.proiswindow THEN '%s'\n"
" WHEN pg_catalog.pg_get_function_result(p.oid) = 'trigger' THEN '%s'\n" " WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN '%s'\n"
" ELSE '%s'\n" " ELSE '%s'\n"
"END as \"%s\"", "END as \"%s\"",
gettext_noop("Result data type"), gettext_noop("Result data type"),
@ -287,7 +288,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
" END AS \"%s\",\n" " END AS \"%s\",\n"
" CASE\n" " CASE\n"
" WHEN p.proisagg THEN '%s'\n" " WHEN p.proisagg THEN '%s'\n"
" WHEN 'trigger' = pg_catalog.format_type(p.prorettype, NULL) THEN '%s'\n" " WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN '%s'\n"
" ELSE '%s'\n" " ELSE '%s'\n"
" END AS \"%s\"", " END AS \"%s\"",
gettext_noop("Result data type"), gettext_noop("Result data type"),
@ -304,7 +305,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
" pg_catalog.oidvectortypes(p.proargtypes) as \"%s\",\n" " pg_catalog.oidvectortypes(p.proargtypes) as \"%s\",\n"
" CASE\n" " CASE\n"
" WHEN p.proisagg THEN '%s'\n" " WHEN p.proisagg THEN '%s'\n"
" WHEN 'trigger' = pg_catalog.format_type(p.prorettype, NULL) THEN '%s'\n" " WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN '%s'\n"
" ELSE '%s'\n" " ELSE '%s'\n"
" END AS \"%s\"", " END AS \"%s\"",
gettext_noop("Result data type"), gettext_noop("Result data type"),
@ -318,14 +319,17 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
if (verbose) if (verbose)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n CASE\n" ",\n CASE\n"
" WHEN p.provolatile = 'i' THEN 'immutable'\n" " WHEN p.provolatile = 'i' THEN '%s'\n"
" WHEN p.provolatile = 's' THEN 'stable'\n" " WHEN p.provolatile = 's' THEN '%s'\n"
" WHEN p.provolatile = 'v' THEN 'volatile'\n" " WHEN p.provolatile = 'v' THEN '%s'\n"
"END as \"%s\"" "END as \"%s\""
",\n pg_catalog.pg_get_userbyid(p.proowner) as \"%s\",\n" ",\n pg_catalog.pg_get_userbyid(p.proowner) as \"%s\",\n"
" l.lanname as \"%s\",\n" " l.lanname as \"%s\",\n"
" p.prosrc as \"%s\",\n" " p.prosrc as \"%s\",\n"
" pg_catalog.obj_description(p.oid, 'pg_proc') as \"%s\"", " pg_catalog.obj_description(p.oid, 'pg_proc') as \"%s\"",
gettext_noop("immutable"),
gettext_noop("stable"),
gettext_noop("volatile"),
gettext_noop("Volatility"), gettext_noop("Volatility"),
gettext_noop("Owner"), gettext_noop("Owner"),
gettext_noop("Language"), gettext_noop("Language"),
@ -340,33 +344,54 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
" LEFT JOIN pg_catalog.pg_language l ON l.oid = p.prolang\n"); " LEFT JOIN pg_catalog.pg_language l ON l.oid = p.prolang\n");
processSQLNamePattern(pset.db, &buf, pattern, false, true, have_where = false;
"n.nspname", "p.proname", NULL,
"pg_catalog.pg_function_is_visible(p.oid)");
/* filter by function type, if requested */
if (showNormal && showAggregate && showTrigger && showWindow) if (showNormal && showAggregate && showTrigger && showWindow)
/* Do nothing */; /* Do nothing */;
else if (showNormal) else if (showNormal)
{ {
if (!showWindow && pset.sversion >= 80400)
appendPQExpBuffer(&buf, " AND NOT p.proiswindow\n");
if (!showAggregate) if (!showAggregate)
appendPQExpBuffer(&buf, " AND NOT p.proisagg\n"); {
if (have_where)
appendPQExpBuffer(&buf, " AND ");
else
{
appendPQExpBuffer(&buf, "WHERE ");
have_where = true;
}
appendPQExpBuffer(&buf, "NOT p.proisagg\n");
}
if (!showTrigger) if (!showTrigger)
{ {
if (pset.sversion >= 80400) if (have_where)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf, " AND ");
" AND pg_catalog.pg_get_function_result(p.oid) <> 'trigger'\n");
else else
appendPQExpBuffer(&buf, {
" AND pg_catalog.format_type(p.prorettype, NULL) <> 'trigger'\n"); appendPQExpBuffer(&buf, "WHERE ");
have_where = true;
}
appendPQExpBuffer(&buf, "p.prorettype <> 'pg_catalog.trigger'::pg_catalog.regtype\n");
}
if (!showWindow && pset.sversion >= 80400)
{
if (have_where)
appendPQExpBuffer(&buf, " AND ");
else
{
appendPQExpBuffer(&buf, "WHERE ");
have_where = true;
}
appendPQExpBuffer(&buf, "NOT p.proiswindow\n");
} }
} }
else else
{ {
bool needs_or = false; bool needs_or = false;
appendPQExpBuffer(&buf, " AND (\n "); appendPQExpBuffer(&buf, "WHERE (\n ");
have_where = true;
/* Note: at least one of these must be true ... */
if (showAggregate) if (showAggregate)
{ {
appendPQExpBuffer(&buf,"p.proisagg\n"); appendPQExpBuffer(&buf,"p.proisagg\n");
@ -376,12 +401,8 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
{ {
if (needs_or) if (needs_or)
appendPQExpBuffer(&buf, " OR "); appendPQExpBuffer(&buf, " OR ");
if (pset.sversion >= 80400)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
"pg_catalog.pg_get_function_result(p.oid) = 'trigger'\n"); "p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype\n");
else
appendPQExpBuffer(&buf,
"'trigger' <> pg_catalog.format_type(p.prorettype, NULL)\n");
needs_or = true; needs_or = true;
} }
if (showWindow) if (showWindow)
@ -389,10 +410,15 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
if (needs_or) if (needs_or)
appendPQExpBuffer(&buf, " OR "); appendPQExpBuffer(&buf, " OR ");
appendPQExpBuffer(&buf, "p.proiswindow\n"); appendPQExpBuffer(&buf, "p.proiswindow\n");
needs_or = true;
} }
appendPQExpBuffer(&buf, " )\n"); appendPQExpBuffer(&buf, " )\n");
} }
processSQLNamePattern(pset.db, &buf, pattern, have_where, true,
"n.nspname", "p.proname", NULL,
"pg_catalog.pg_function_is_visible(p.oid)");
if (!showSystem && !pattern) if (!showSystem && !pattern)
appendPQExpBuffer(&buf, " AND n.nspname <> 'pg_catalog'\n" appendPQExpBuffer(&buf, " AND n.nspname <> 'pg_catalog'\n"
" AND n.nspname <> 'information_schema'\n"); " AND n.nspname <> 'information_schema'\n");
@ -407,6 +433,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
myopt.nullPrint = NULL; myopt.nullPrint = NULL;
myopt.title = _("List of functions"); myopt.title = _("List of functions");
myopt.translate_header = true; myopt.translate_header = true;
myopt.translate_columns = translate_columns;
printQuery(res, &myopt, pset.queryFout, pset.logfile); printQuery(res, &myopt, pset.queryFout, pset.logfile);