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.c56
1 files changed, 9 insertions, 47 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 6521e14f497..bfc9a32afe7 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -2244,8 +2244,6 @@ dumpTableData(Archive *fout, TableDataInfo *tdinfo)
.owner = tbinfo->rolname,
.description = "TABLE DATA",
.section = SECTION_DATA,
- .createStmt = "",
- .dropStmt = "",
.copyStmt = copyStmt,
.deps = &(tbinfo->dobj.dumpId),
.nDeps = 1,
@@ -2300,7 +2298,6 @@ refreshMatViewData(Archive *fout, TableDataInfo *tdinfo)
.description = "MATERIALIZED VIEW DATA",
.section = SECTION_POST_DATA,
.createStmt = q->data,
- .dropStmt = "",
.deps = tdinfo->dobj.dependencies,
.nDeps = tdinfo->dobj.nDeps));
@@ -2865,7 +2862,6 @@ dumpDatabase(Archive *fout)
.description = "COMMENT",
.section = SECTION_NONE,
.createStmt = dbQry->data,
- .dropStmt = "",
.deps = &dbDumpId,
.nDeps = 1));
}
@@ -2895,7 +2891,6 @@ dumpDatabase(Archive *fout)
.description = "SECURITY LABEL",
.section = SECTION_NONE,
.createStmt = seclabelQry->data,
- .dropStmt = "",
.deps = &dbDumpId,
.nDeps = 1));
destroyPQExpBuffer(seclabelQry);
@@ -3012,10 +3007,8 @@ dumpDatabase(Archive *fout)
ArchiveEntry(fout, nilCatalogId, createDumpId(),
ARCHIVE_OPTS(.tag = "pg_largeobject",
.description = "pg_largeobject",
- .owner = "",
.section = SECTION_PRE_DATA,
- .createStmt = loOutQry->data,
- .dropStmt = ""));
+ .createStmt = loOutQry->data));
PQclear(lo_res);
@@ -3122,10 +3115,8 @@ dumpEncoding(Archive *AH)
ArchiveEntry(AH, nilCatalogId, createDumpId(),
ARCHIVE_OPTS(.tag = "ENCODING",
.description = "ENCODING",
- .owner = "",
.section = SECTION_PRE_DATA,
- .createStmt = qry->data,
- .dropStmt = ""));
+ .createStmt = qry->data));
destroyPQExpBuffer(qry);
}
@@ -3149,10 +3140,8 @@ dumpStdStrings(Archive *AH)
ArchiveEntry(AH, nilCatalogId, createDumpId(),
ARCHIVE_OPTS(.tag = "STDSTRINGS",
.description = "STDSTRINGS",
- .owner = "",
.section = SECTION_PRE_DATA,
- .createStmt = qry->data,
- .dropStmt = ""));
+ .createStmt = qry->data));
destroyPQExpBuffer(qry);
}
@@ -3205,10 +3194,8 @@ dumpSearchPath(Archive *AH)
ArchiveEntry(AH, nilCatalogId, createDumpId(),
ARCHIVE_OPTS(.tag = "SEARCHPATH",
.description = "SEARCHPATH",
- .owner = "",
.section = SECTION_PRE_DATA,
- .createStmt = qry->data,
- .dropStmt = ""));
+ .createStmt = qry->data));
/* Also save it in AH->searchpath, in case we're doing plain text dump */
AH->searchpath = pg_strdup(qry->data);
@@ -3684,7 +3671,6 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
.description = "ROW SECURITY",
.section = SECTION_POST_DATA,
.createStmt = query->data,
- .dropStmt = "",
.deps = &(tbinfo->dobj.dumpId),
.nDeps = 1));
@@ -4051,10 +4037,8 @@ dumpPublicationTable(Archive *fout, PublicationRelInfo *pubrinfo)
ARCHIVE_OPTS(.tag = tag,
.namespace = tbinfo->dobj.namespace->dobj.name,
.description = "PUBLICATION TABLE",
- .owner = "",
.section = SECTION_POST_DATA,
- .createStmt = query->data,
- .dropStmt = ""));
+ .createStmt = query->data));
free(tag);
destroyPQExpBuffer(query);
@@ -9502,7 +9486,6 @@ dumpComment(Archive *fout, const char *type, const char *name,
.description = "COMMENT",
.section = SECTION_NONE,
.createStmt = query->data,
- .dropStmt = "",
.deps = &dumpId,
.nDeps = 1));
@@ -9572,7 +9555,6 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
.description = "COMMENT",
.section = SECTION_NONE,
.createStmt = query->data,
- .dropStmt = "",
.deps = &(tbinfo->dobj.dumpId),
.nDeps = 1));
}
@@ -9598,7 +9580,6 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
.description = "COMMENT",
.section = SECTION_NONE,
.createStmt = query->data,
- .dropStmt = "",
.deps = &(tbinfo->dobj.dumpId),
.nDeps = 1));
}
@@ -9879,11 +9860,8 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj)
te = ArchiveEntry(fout, dobj->catId, dobj->dumpId,
ARCHIVE_OPTS(.tag = dobj->name,
.description = "BLOBS",
- .owner = "",
.section = SECTION_DATA,
- .dumpFn = dumpBlobs,
- .createStmt = "",
- .dropStmt = ""));
+ .dumpFn = dumpBlobs));
/*
* Set the TocEntry's dataLength in case we are doing a
@@ -10088,7 +10066,6 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
ArchiveEntry(fout, extinfo->dobj.catId, extinfo->dobj.dumpId,
ARCHIVE_OPTS(.tag = extinfo->dobj.name,
.description = "EXTENSION",
- .owner = "",
.section = SECTION_PRE_DATA,
.createStmt = q->data,
.dropStmt = delq->data));
@@ -11232,7 +11209,6 @@ dumpCompositeTypeColComments(Archive *fout, TypeInfo *tyinfo)
.description = "COMMENT",
.section = SECTION_NONE,
.createStmt = query->data,
- .dropStmt = "",
.deps = &(tyinfo->dobj.dumpId),
.nDeps = 1));
}
@@ -11288,8 +11264,7 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo)
.owner = stinfo->baseType->rolname,
.description = "SHELL TYPE",
.section = SECTION_PRE_DATA,
- .createStmt = q->data,
- .dropStmt = ""));
+ .createStmt = q->data));
destroyPQExpBuffer(q);
}
@@ -12234,7 +12209,6 @@ dumpCast(Archive *fout, CastInfo *cast)
ArchiveEntry(fout, cast->dobj.catId, cast->dobj.dumpId,
ARCHIVE_OPTS(.tag = labelq->data,
.description = "CAST",
- .owner = "",
.section = SECTION_PRE_DATA,
.createStmt = defqry->data,
.dropStmt = delqry->data));
@@ -12362,7 +12336,6 @@ dumpTransform(Archive *fout, TransformInfo *transform)
ArchiveEntry(fout, transform->dobj.catId, transform->dobj.dumpId,
ARCHIVE_OPTS(.tag = labelq->data,
.description = "TRANSFORM",
- .owner = "",
.section = SECTION_PRE_DATA,
.createStmt = defqry->data,
.dropStmt = delqry->data,
@@ -12749,7 +12722,6 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
ArchiveEntry(fout, aminfo->dobj.catId, aminfo->dobj.dumpId,
ARCHIVE_OPTS(.tag = aminfo->dobj.name,
.description = "ACCESS METHOD",
- .owner = "",
.section = SECTION_PRE_DATA,
.createStmt = q->data,
.dropStmt = delq->data));
@@ -14211,7 +14183,6 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
ARCHIVE_OPTS(.tag = prsinfo->dobj.name,
.namespace = prsinfo->dobj.namespace->dobj.name,
.description = "TEXT SEARCH PARSER",
- .owner = "",
.section = SECTION_PRE_DATA,
.createStmt = q->data,
.dropStmt = delq->data));
@@ -14350,7 +14321,6 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
ARCHIVE_OPTS(.tag = tmplinfo->dobj.name,
.namespace = tmplinfo->dobj.namespace->dobj.name,
.description = "TEXT SEARCH TEMPLATE",
- .owner = "",
.section = SECTION_PRE_DATA,
.createStmt = q->data,
.dropStmt = delq->data));
@@ -14819,8 +14789,7 @@ dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo)
.owner = daclinfo->defaclrole,
.description = "DEFAULT ACL",
.section = SECTION_POST_DATA,
- .createStmt = q->data,
- .dropStmt = ""));
+ .createStmt = q->data));
destroyPQExpBuffer(tag);
destroyPQExpBuffer(q);
@@ -14916,7 +14885,6 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
.description = "ACL",
.section = SECTION_NONE,
.createStmt = sql->data,
- .dropStmt = "",
.deps = &objDumpId,
.nDeps = 1));
destroyPQExpBuffer(tag);
@@ -15006,7 +14974,6 @@ dumpSecLabel(Archive *fout, const char *type, const char *name,
.description = "SECURITY LABEL",
.section = SECTION_NONE,
.createStmt = query->data,
- .dropStmt = "",
.deps = &dumpId,
.nDeps = 1));
destroyPQExpBuffer(tag);
@@ -15090,7 +15057,6 @@ dumpTableSecLabel(Archive *fout, TableInfo *tbinfo, const char *reltypename)
.description = "SECURITY LABEL",
.section = SECTION_NONE,
.createStmt = query->data,
- .dropStmt = "",
.deps = &(tbinfo->dobj.dumpId),
.nDeps = 1));
}
@@ -16438,10 +16404,8 @@ dumpIndexAttach(Archive *fout, IndexAttachInfo *attachinfo)
ARCHIVE_OPTS(.tag = attachinfo->dobj.name,
.namespace = attachinfo->dobj.namespace->dobj.name,
.description = "INDEX ATTACH",
- .owner = "",
.section = SECTION_POST_DATA,
- .createStmt = q->data,
- .dropStmt = ""));
+ .createStmt = q->data));
destroyPQExpBuffer(q);
}
@@ -17071,7 +17035,6 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
.description = "SEQUENCE OWNED BY",
.section = SECTION_PRE_DATA,
.createStmt = query->data,
- .dropStmt = "",
.deps = &(tbinfo->dobj.dumpId),
.nDeps = 1));
}
@@ -17140,7 +17103,6 @@ dumpSequenceData(Archive *fout, TableDataInfo *tdinfo)
.description = "SEQUENCE SET",
.section = SECTION_DATA,
.createStmt = query->data,
- .dropStmt = "",
.deps = &(tbinfo->dobj.dumpId),
.nDeps = 1));