database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Code review for patch to show definition of index columns in \d on index.

Browse Source 
Safely schema-qualify the pg_get_indexdef call, make the query a bit
prettier in -E mode, remove useless join to pg_index, make it more obvious
that the header[] array is not overrun.
This commit is contained in:
Tom Lane
2009-07-07 16:28:38 +00:00
parent 47386fed46
commit 788d8e5139
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
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.220 2009/07/06 17:01:42 petere Exp $ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.221 2009/07/07 16:28:38 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -1028,7 +1028,7 @@ describeOneTableDetails(const char *schemaname,
char **ptr; char **ptr;
PQExpBufferData title; PQExpBufferData title;
PQExpBufferData tmpbuf; PQExpBufferData tmpbuf;
int cols = 0; int cols;
int numrows = 0; int numrows = 0;
struct struct
{ {
@ -1156,7 +1156,7 @@ describeOneTableDetails(const char *schemaname,
PQclear(result); PQclear(result);
} }
/* Get column info (index requires additional checks) */ /* Get column info */
printfPQExpBuffer(&buf, "SELECT a.attname,"); printfPQExpBuffer(&buf, "SELECT a.attname,");
appendPQExpBuffer(&buf, "\n pg_catalog.format_type(a.atttypid, a.atttypmod)," appendPQExpBuffer(&buf, "\n pg_catalog.format_type(a.atttypid, a.atttypmod),"
"\n (SELECT substring(pg_catalog.pg_get_expr(d.adbin, d.adrelid) for 128)" "\n (SELECT substring(pg_catalog.pg_get_expr(d.adbin, d.adrelid) for 128)"
@ -1164,15 +1164,11 @@ describeOneTableDetails(const char *schemaname,
"\n WHERE d.adrelid = a.attrelid AND d.adnum = a.attnum AND a.atthasdef)," "\n WHERE d.adrelid = a.attrelid AND d.adnum = a.attnum AND a.atthasdef),"
"\n a.attnotnull, a.attnum"); "\n a.attnotnull, a.attnum");
if (tableinfo.relkind == 'i') if (tableinfo.relkind == 'i')
appendPQExpBuffer(&buf, ", pg_get_indexdef(i.indexrelid,a.attnum, TRUE) AS indexdef"); appendPQExpBuffer(&buf, ",\n pg_catalog.pg_get_indexdef(a.attrelid, a.attnum, TRUE) AS indexdef");
if (verbose) if (verbose)
appendPQExpBuffer(&buf, ", a.attstorage, pg_catalog.col_description(a.attrelid, a.attnum)"); appendPQExpBuffer(&buf, ",\n a.attstorage, pg_catalog.col_description(a.attrelid, a.attnum)");
appendPQExpBuffer(&buf, "\nFROM pg_catalog.pg_attribute a"); appendPQExpBuffer(&buf, "\nFROM pg_catalog.pg_attribute a");
if (tableinfo.relkind == 'i')
appendPQExpBuffer(&buf, ", pg_catalog.pg_index i");
appendPQExpBuffer(&buf, "\nWHERE a.attrelid = '%s' AND a.attnum > 0 AND NOT a.attisdropped", oid); appendPQExpBuffer(&buf, "\nWHERE a.attrelid = '%s' AND a.attnum > 0 AND NOT a.attisdropped", oid);
if (tableinfo.relkind == 'i')
appendPQExpBuffer(&buf, " AND a.attrelid = i.indexrelid");
appendPQExpBuffer(&buf, "\nORDER BY a.attnum"); appendPQExpBuffer(&buf, "\nORDER BY a.attnum");
res = PSQLexec(buf.data, false); res = PSQLexec(buf.data, false);
@ -1220,9 +1216,9 @@ describeOneTableDetails(const char *schemaname,
} }
/* Set the number of columns, and their names */ /* Set the number of columns, and their names */
cols += 2;
headers[0] = gettext_noop("Column"); headers[0] = gettext_noop("Column");
headers[1] = gettext_noop("Type"); headers[1] = gettext_noop("Type");
cols = 2;
if (tableinfo.relkind == 'r' || tableinfo.relkind == 'v') if (tableinfo.relkind == 'r' || tableinfo.relkind == 'v')
{ {
@ -1302,15 +1298,15 @@ describeOneTableDetails(const char *schemaname,
if (tableinfo.relkind == 'S') if (tableinfo.relkind == 'S')
printTableAddCell(&cont, seq_values[i], false); printTableAddCell(&cont, seq_values[i], false);
/* Expression for index */ /* Expression for index column */
if (tableinfo.relkind == 'i') if (tableinfo.relkind == 'i')
printTableAddCell(&cont, PQgetvalue(res, i, 5), false); printTableAddCell(&cont, PQgetvalue(res, i, 5), false);
/* Storage and Description */ /* Storage and Description */
if (verbose) if (verbose)
{ {
int fnum = (tableinfo.relkind == 'i' ? 6 : 5); int firstvcol = (tableinfo.relkind == 'i' ? 6 : 5);
char *storage = PQgetvalue(res, i, fnum); char *storage = PQgetvalue(res, i, firstvcol);
/* these strings are literal in our syntax, so not translated. */ /* these strings are literal in our syntax, so not translated. */
printTableAddCell(&cont, (storage[0] == 'p' ? "plain" : printTableAddCell(&cont, (storage[0] == 'p' ? "plain" :
@ -1319,7 +1315,7 @@ describeOneTableDetails(const char *schemaname,
(storage[0] == 'e' ? "external" : (storage[0] == 'e' ? "external" :
"???")))), "???")))),
false); false);
printTableAddCell(&cont, PQgetvalue(res, i, fnum + 1), false); printTableAddCell(&cont, PQgetvalue(res, i, firstvcol + 1), false);
} }
} }
@ -1844,20 +1840,23 @@ describeOneTableDetails(const char *schemaname,
} }
else else
{ {
/* display the list of child tables*/ /* display the list of child tables */
const char *ct = _("Child tables");
for (i = 0; i < tuples; i++) for (i = 0; i < tuples; i++)
{ {
const char *ct = _("Child tables"); if (i == 0)
printfPQExpBuffer(&buf, "%s: %s",
ct, PQgetvalue(result, i, 0));
else
printfPQExpBuffer(&buf, "%*s %s",
(int) strlen(ct), "",
PQgetvalue(result, i, 0));
if (i < tuples - 1)
appendPQExpBuffer(&buf, ",");
if (i == 0) printTableAddFooter(&cont, buf.data);
printfPQExpBuffer(&buf, "%s: %s", ct, PQgetvalue(result, i, 0)); }
else
printfPQExpBuffer(&buf, "%*s %s", (int) strlen(ct), "", PQgetvalue(result, i, 0));
if (i < tuples - 1)
appendPQExpBuffer(&buf, ",");
printTableAddFooter(&cont, buf.data);
}
} }
PQclear(result); PQclear(result);