diff options
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 4c6b9511edb..c4c2482409a 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12,7 +12,7 @@ * by PostgreSQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.383 2004/08/04 21:34:11 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.384 2004/08/06 18:18:42 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2393,10 +2393,10 @@ getTables(int *numTables) "d.classid = c.tableoid and d.objid = c.oid and " "d.objsubid = 0 and " "d.refclassid = c.tableoid and d.deptype = 'i') " - "where relkind in ('%c', '%c', '%c', '%c') " + "where relkind in ('%c', '%c', '%c') " "order by c.oid", RELKIND_SEQUENCE, - RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW, RELKIND_COMPOSITE_TYPE); + RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW); } else if (g_fout->remoteVersion >= 70300) { @@ -2419,10 +2419,10 @@ getTables(int *numTables) "d.classid = c.tableoid and d.objid = c.oid and " "d.objsubid = 0 and " "d.refclassid = c.tableoid and d.deptype = 'i') " - "where relkind in ('%c', '%c', '%c', '%c') " + "where relkind in ('%c', '%c', '%c') " "order by c.oid", RELKIND_SEQUENCE, - RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW, RELKIND_COMPOSITE_TYPE); + RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW); } else if (g_fout->remoteVersion >= 70200) { @@ -4063,7 +4063,7 @@ dumpComment(Archive *fout, const char *target, /* * dumpTableComment -- * - * As above, but dump comments for both the specified table, view or composite type + * As above, but dump comments for both the specified table (or view) * and its columns. */ static void @@ -4864,7 +4864,6 @@ dumpCompositeType(Archive *fout, TypeInfo *tinfo) int i_attname; int i_atttypdefn; int i; - TableInfo *tableInfo; /* Set proper schema search path so type references list correctly */ selectSourceSchema(tinfo->dobj.namespace->dobj.name); @@ -4929,6 +4928,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tinfo) tinfo->dobj.dependencies, tinfo->dobj.nDeps, NULL, NULL); + /* Dump Type Comments */ resetPQExpBuffer(q); @@ -4937,13 +4937,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tinfo) tinfo->dobj.namespace->dobj.name, tinfo->usename, tinfo->dobj.catId, 0, tinfo->dobj.dumpId); - /* Dump column comments */ - tableInfo = findTableByOid(tinfo->typrelid); - if (tableInfo) - dumpTableComment(fout, tableInfo, "TABLE"); - PQclear(res); - destroyPQExpBuffer(q); destroyPQExpBuffer(delq); destroyPQExpBuffer(query); @@ -6438,7 +6432,7 @@ dumpTable(Archive *fout, TableInfo *tbinfo) { if (tbinfo->relkind == RELKIND_SEQUENCE) dumpSequence(fout, tbinfo); - else if (!dataOnly && tbinfo->relkind != RELKIND_COMPOSITE_TYPE) + else if (!dataOnly) dumpTableSchema(fout, tbinfo); /* Handle the ACL here */ |