diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-08-15 16:36:08 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-08-15 16:36:08 +0000 |
| commit | b1a5f8720987fbfda23c6bfb4a0dd683b9bdae70 (patch) | |
| tree | 9212ba16b7941ad741708dd0999beaf3e6948232 /src/bin/psql/describe.c | |
| parent | 38294db64bce9e78e6a1fc55fb6746074de59d2b (diff) | |
Tom Lane wrote:
> There's no longer a separate call to heap_storage_create in that routine
> --- the right place to make the test is now in the storage_create
> boolean parameter being passed to heap_create. A simple change, but
> it passeth patch's understanding ...
Thanks.
Attached is a patch against cvs tip as of 8:30 PM PST or so. Turned out
that even after fixing the failed hunks, there was a new spot in
bufmgr.c which needed to be fixed (related to temp relations;
RelationUpdateNumberOfBlocks). But thankfully the regression test code
caught it :-)
Joe Conway
Diffstat (limited to 'src/bin/psql/describe.c')
| -rw-r--r-- | src/bin/psql/describe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index dc37b9b7ba4..5b446e673d7 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -3,7 +3,7 @@ * * Copyright 2000-2002 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.60 2002/08/10 16:01:16 tgl Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.61 2002/08/15 16:36:06 momjian Exp $ */ #include "postgres_fe.h" #include "describe.h" @@ -210,9 +210,12 @@ describeTypes(const char *pattern, bool verbose) /* * do not include array types (start with underscore), do not include - * user relations (typrelid!=0) + * user relations (typrelid!=0) unless they are type relations */ - appendPQExpBuffer(&buf, "WHERE t.typrelid = 0 AND t.typname !~ '^_'\n"); + appendPQExpBuffer(&buf, "WHERE (t.typrelid = 0 "); + appendPQExpBuffer(&buf, "OR (SELECT c.relkind = 'c' FROM pg_class c " + "where c.oid = t.typrelid)) "); + appendPQExpBuffer(&buf, "AND t.typname !~ '^_'\n"); /* Match name pattern against either internal or external name */ processNamePattern(&buf, pattern, true, false, |