aboutsummaryrefslogtreecommitdiff
path: root/src/bin/pg_dump/pg_dump.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/pg_dump/pg_dump.c')
-rw-r--r--src/bin/pg_dump/pg_dump.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index fe16a8cc2ee..f81ba7334a3 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -2099,8 +2099,6 @@ dumpTableData_insert(Archive *fout, void *dcontext)
if (nfields == 0)
continue;
- Assert(tbinfo->attgenerated);
-
/* Emit a row heading */
if (rows_per_statement == 1)
archputs(" (", fout);
@@ -2261,6 +2259,9 @@ dumpTableData(Archive *fout, TableDataInfo *tdinfo)
char *copyStmt;
const char *copyFrom;
+ /* We had better have loaded per-column details about this table */
+ Assert(tbinfo->interesting);
+
if (!dopt->dump_inserts)
{
/* Dump/restore using COPY */
@@ -2452,6 +2453,9 @@ makeTableDataInfo(DumpOptions *dopt, TableInfo *tbinfo)
addObjectDependency(&tdinfo->dobj, tbinfo->dobj.dumpId);
tbinfo->dataObj = tdinfo;
+
+ /* Make sure that we'll collect per-column info for this table. */
+ tbinfo->interesting = true;
}
/*
@@ -15772,10 +15776,12 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
int j,
k;
+ /* We had better have loaded per-column details about this table */
+ Assert(tbinfo->interesting);
+
qrelname = pg_strdup(fmtId(tbinfo->dobj.name));
qualrelname = pg_strdup(fmtQualifiedDumpable(tbinfo));
-
if (tbinfo->hasoids)
pg_log_warning("WITH OIDS is not supported anymore (table \"%s\")",
qrelname);
@@ -18143,8 +18149,6 @@ processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
configtbl->dataObj->filtercond = pg_strdup(extconditionarray[j]);
}
}
-
- configtbl->interesting = dumpobj;
}
}
if (extconfigarray)