rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 22:11:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

This patch finishes off the work that I did with making view

Browse Source 
definitions use pretty printing.

It does:

* Pretty index predicates
* Pretty rule definitions
* Uppercases PRIMARY KEY and UNIQUE to be consistent with CHECK and
FOREIGN KEY
* View rules are improved to match table rules:


Christopher Kings-Lynne
This commit is contained in:
Bruce Momjian 2003-12-01 22:11:06 +00:00
parent 7ce9b7c0d8
commit abd5d75c4c
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2003, PostgreSQL Global Development Group * Copyright (c) 2000-2003, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.88 2003/11/29 19:52:06 pgsql Exp $ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.89 2003/12/01 22:11:06 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "describe.h" #include "describe.h"
@ -857,7 +857,7 @@ describeOneTableDetails(const char *schemaname,
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT i.indisunique, i.indisprimary, a.amname, c2.relname,\n" "SELECT i.indisunique, i.indisprimary, a.amname, c2.relname,\n"
" pg_catalog.pg_get_expr(i.indpred, i.indrelid)\n" " pg_catalog.pg_get_expr(i.indpred, i.indrelid, true)\n"
"FROM pg_catalog.pg_index i, pg_catalog.pg_class c, pg_catalog.pg_class c2, pg_catalog.pg_am a\n" "FROM pg_catalog.pg_index i, pg_catalog.pg_class c, pg_catalog.pg_class c2, pg_catalog.pg_am a\n"
"WHERE i.indexrelid = c.oid AND c.oid = '%s' AND c.relam = a.oid\n" "WHERE i.indexrelid = c.oid AND c.oid = '%s' AND c.relam = a.oid\n"
"AND i.indrelid = c2.oid", "AND i.indrelid = c2.oid",
@ -880,9 +880,9 @@ describeOneTableDetails(const char *schemaname,
char *indpred = PQgetvalue(result, 0, 4); char *indpred = PQgetvalue(result, 0, 4);
if (strcmp(indisprimary, "t") == 0) if (strcmp(indisprimary, "t") == 0)
printfPQExpBuffer(&tmpbuf, _("primary key, ")); printfPQExpBuffer(&tmpbuf, _("PRIMARY KEY, "));
else if (strcmp(indisunique, "t") == 0) else if (strcmp(indisunique, "t") == 0)
printfPQExpBuffer(&tmpbuf, _("unique, ")); printfPQExpBuffer(&tmpbuf, _("UNIQUE, "));
else else
resetPQExpBuffer(&tmpbuf); resetPQExpBuffer(&tmpbuf);
appendPQExpBuffer(&tmpbuf, "%s, ", indamname); appendPQExpBuffer(&tmpbuf, "%s, ", indamname);
@ -892,7 +892,7 @@ describeOneTableDetails(const char *schemaname,
schemaname, indtable); schemaname, indtable);
if (strlen(indpred)) if (strlen(indpred))
appendPQExpBuffer(&tmpbuf, ", predicate %s", indpred); appendPQExpBuffer(&tmpbuf, ", predicate (%s)", indpred);
footers = xmalloczero(2 * sizeof(*footers)); footers = xmalloczero(2 * sizeof(*footers));
footers[0] = xstrdup(tmpbuf.data); footers[0] = xstrdup(tmpbuf.data);
@ -911,7 +911,7 @@ describeOneTableDetails(const char *schemaname,
if (tableinfo.hasrules) if (tableinfo.hasrules)
{ {
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT r.rulename\n" "SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid, true))\n"
"FROM pg_catalog.pg_rewrite r\n" "FROM pg_catalog.pg_rewrite r\n"
"WHERE r.ev_class = '%s' AND r.rulename != '_RETURN'", "WHERE r.ev_class = '%s' AND r.rulename != '_RETURN'",
oid); oid);
@ -923,27 +923,31 @@ describeOneTableDetails(const char *schemaname,
} }
/* Footer information about a view */ /* Footer information about a view */
footers = xmalloczero((rule_count + 2) * sizeof(*footers)); footers = xmalloczero((rule_count + 3) * sizeof(*footers));
footers[count_footers] = xmalloc(64 + strlen(view_def)); footers[count_footers] = xmalloc(64 + strlen(view_def));
snprintf(footers[count_footers], 64 + strlen(view_def), snprintf(footers[count_footers], 64 + strlen(view_def),
_("View definition:\n%s"), view_def); _("View definition:\n%s"), view_def);
count_footers++; count_footers++;
/* print rules */ /* print rules */
if (rule_count > 0)
{
printfPQExpBuffer(&buf, _("Rules:"));
footers[count_footers++] = xstrdup(buf.data);
for (i = 0; i < rule_count; i++) for (i = 0; i < rule_count; i++)
{ {
char *s = _("Rules"); const char *ruledef;
if (i == 0) /* Everything after "CREATE RULE" is echoed verbatim */
printfPQExpBuffer(&buf, "%s: %s", s, PQgetvalue(result, i, 0)); ruledef = PQgetvalue(result, i, 1);
else ruledef += 12;
printfPQExpBuffer(&buf, "%*s %s", (int) strlen(s), "", PQgetvalue(result, i, 0));
if (i < rule_count - 1) printfPQExpBuffer(&buf, " %s", ruledef);
appendPQExpBuffer(&buf, ",");
footers[count_footers++] = xstrdup(buf.data); footers[count_footers++] = xstrdup(buf.data);
} }
PQclear(result); PQclear(result);
}
footers[count_footers] = NULL; footers[count_footers] = NULL;
@ -970,7 +974,7 @@ describeOneTableDetails(const char *schemaname,
{ {
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT c2.relname, i.indisprimary, i.indisunique, " "SELECT c2.relname, i.indisprimary, i.indisunique, "
"pg_catalog.pg_get_indexdef(i.indexrelid)\n" "pg_catalog.pg_get_indexdef(i.indexrelid, 0, true)\n"
"FROM pg_catalog.pg_class c, pg_catalog.pg_class c2, pg_catalog.pg_index i\n" "FROM pg_catalog.pg_class c, pg_catalog.pg_class c2, pg_catalog.pg_index i\n"
"WHERE c.oid = '%s' AND c.oid = i.indrelid AND i.indexrelid = c2.oid\n" "WHERE c.oid = '%s' AND c.oid = i.indrelid AND i.indexrelid = c2.oid\n"
"ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname", "ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname",
@ -1006,7 +1010,7 @@ describeOneTableDetails(const char *schemaname,
if (tableinfo.hasrules) if (tableinfo.hasrules)
{ {
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid))\n" "SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid, true))\n"
"FROM pg_catalog.pg_rewrite r\n" "FROM pg_catalog.pg_rewrite r\n"
"WHERE r.ev_class = '%s'", "WHERE r.ev_class = '%s'",
oid); oid);
@ -1051,7 +1055,7 @@ describeOneTableDetails(const char *schemaname,
{ {
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT conname,\n" "SELECT conname,\n"
" pg_catalog.pg_get_constraintdef(oid) as condef\n" " pg_catalog.pg_get_constraintdef(oid, true) as condef\n"
"FROM pg_catalog.pg_constraint r\n" "FROM pg_catalog.pg_constraint r\n"
"WHERE r.conrelid = '%s' AND r.contype = 'f'", "WHERE r.conrelid = '%s' AND r.contype = 'f'",
oid); oid);
@ -1097,9 +1101,9 @@ describeOneTableDetails(const char *schemaname,
/* Label as primary key or unique (but not both) */ /* Label as primary key or unique (but not both) */
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
strcmp(PQgetvalue(result1, i, 1), "t") == 0 strcmp(PQgetvalue(result1, i, 1), "t") == 0
? _(" primary key,") : ? _(" PRIMARY KEY,") :
(strcmp(PQgetvalue(result1, i, 2), "t") == 0 (strcmp(PQgetvalue(result1, i, 2), "t") == 0
? _(" unique,") ? _(" UNIQUE,")
: "")); : ""));
/* Everything after "USING" is echoed verbatim */ /* Everything after "USING" is echoed verbatim */