Here's a rebased patch for this (I also pgindented it).
One thing I find a bit odd is the fact that we copy
RestoreOptions->superuser into DumpOptions->outputSuperuser (a char *
pointer) without pstrdup or similar. We're already doing the inverse
elsewhere, and the uses of the routine where this is done are pretty
limited, so it seems harmless. Still, it's pretty weird. (Really,
the whole dumpOptionsFromRestoreOptions() business is odd.)
I'm not real happy with the forward struct declare in pg_backup.h, but I
think this is just general messiness in this code structure and not this
patch' fault.
--
Álvaro Herrera http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Training & Services
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 2f855cf..17e9574 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -64,7 +64,7 @@ static DumpableObject **nspinfoindex;
static void flagInhTables(TableInfo *tbinfo, int numTables,
InhInfo *inhinfo, int numInherits);
-static void flagInhAttrs(TableInfo *tblinfo, int numTables);
+static void flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int numTables);
static DumpableObject **buildIndexArray(void *objArray, int numObjs,
Size objSize);
static int DOCatalogIdCompare(const void *p1, const void *p2);
@@ -78,7 +78,7 @@ static int strInArray(const char *pattern, char **arr, int arr_size);
* Collect information about all potentially dumpable objects
*/
TableInfo *
-getSchemaData(Archive *fout, int *numTablesPtr)
+getSchemaData(Archive *fout, DumpOptions *dopt, int *numTablesPtr)
{
ExtensionInfo *extinfo;
InhInfo *inhinfo;
@@ -114,7 +114,7 @@ getSchemaData(Archive *fout, int *numTablesPtr)
*/
if (g_verbose)
write_msg(NULL, "reading user-defined tables\n");
- tblinfo = getTables(fout, &numTables);
+ tblinfo = getTables(fout, dopt, &numTables);
tblinfoindex = buildIndexArray(tblinfo, numTables, sizeof(TableInfo));
/* Do this after we've built tblinfoindex */
@@ -122,11 +122,11 @@ getSchemaData(Archive *fout, int *numTablesPtr)
if (g_verbose)
write_msg(NULL, "reading extensions\n");
- extinfo = getExtensions(fout, &numExtensions);
+ extinfo = getExtensions(fout, dopt, &numExtensions);
if (g_verbose)
write_msg(NULL, "reading user-defined functions\n");
- funinfo = getFuncs(fout, &numFuncs);
+ funinfo = getFuncs(fout, dopt, &numFuncs);
funinfoindex = buildIndexArray(funinfo, numFuncs, sizeof(FuncInfo));
/* this must be after getTables and getFuncs */
@@ -142,7 +142,7 @@ getSchemaData(Archive *fout, int *numTablesPtr)
if (g_verbose)
write_msg(NULL, "reading user-defined aggregate functions\n");
- getAggregates(fout, &numAggregates);
+ getAggregates(fout, dopt, &numAggregates);
if (g_verbose)
write_msg(NULL, "reading user-defined operators\n");
@@ -183,7 +183,7 @@ getSchemaData(Archive *fout, int *numTablesPtr)
if (g_verbose)
write_msg(NULL, "reading default privileges\n");
- getDefaultACLs(fout, &numDefaultACLs);
+ getDefaultACLs(fout, dopt, &numDefaultACLs);
if (g_verbose)
write_msg(NULL, "reading user-defined collations\n");
@@ -213,7 +213,7 @@ getSchemaData(Archive *fout, int *numTablesPtr)
*/
if (g_verbose)
write_msg(NULL, "finding extension members\n");
- getExtensionMembership(fout, extinfo, numExtensions);
+ getExtensionMembership(fout, dopt, extinfo, numExtensions);
/* Link tables to parents, mark parents of target tables interesting */
if (g_verbose)
@@ -222,11 +222,11 @@ getSchemaData(Archive *fout, int *numTablesPtr)
if (g_verbose)
write_msg(NULL, "reading column info for interesting tables\n");
- getTableAttrs(fout, tblinfo, numTables);
+ getTableAttrs(fout, dopt, tblinfo, numTables);
if (g_verbose)
write_msg(NULL, "flagging inherited columns in subtables\n");
- flagInhAttrs(tblinfo, numTables);
+ flagInhAttrs(dopt, tblinfo, numTables);
if (g_verbose)
write_msg(NULL, "reading indexes\n");
@@ -307,7 +307,7 @@ flagInhTables(TableInfo *tblinfo, int numTables,
* modifies tblinfo
*/
static void
-flagInhAttrs(TableInfo *tblinfo, int numTables)
+flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int numTables)
{
int i,
j,
@@ -384,7 +384,7 @@ flagInhAttrs(TableInfo *tblinfo, int numTables)
attrDef->adef_expr = pg_strdup("NULL");
/* Will column be dumped explicitly? */
- if (shouldPrintColumn(tbinfo, j))
+ if (shouldPrintColumn(dopt, tbinfo, j))
{
attrDef->separate = false;
/* No dependency needed: NULL cannot have dependencies */
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index e50dd8b..ceed115 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -89,11 +89,12 @@ static void WaitForTerminatingWorkers(ParallelState *pstate);
static void sigTermHandler(int signum);
#endif
static void SetupWorker(ArchiveHandle *AH, int pipefd[2], int worker,
+ DumpOptions *dopt,
RestoreOptions *ropt);
static bool HasEveryWorkerTerminated(ParallelState *pstate);
static void lockTableNoWait(ArchiveHandle *AH, TocEntry *te);
-static void WaitForCommands(ArchiveHandle *AH, int pipefd[2]);
+static void WaitForCommands(ArchiveHandle *AH, DumpOptions *dopt, int pipefd[2]);
static char *getMessageFromMaster(int pipefd[2]);
static void sendMessageToMaster(int pipefd[2], const char *str);
static int select_loop(int maxFd, fd_set *workerset);
@@ -436,6 +437,7 @@ sigTermHandler(int signum)
*/
static void
SetupWorker(ArchiveHandle *AH, int pipefd[2], int worker,
+ DumpOptions *dopt,
RestoreOptions *ropt)
{
/*
@@ -445,11 +447,11 @@ SetupWorker(ArchiveHandle *AH, int pipefd[2], int worker,
* properly when we shut down. This happens only that way when it is
* brought down because of an error.
*/
- (AH->SetupWorkerPtr) ((Archive *) AH, ropt);
+ (AH->SetupWorkerPtr) ((Archive *) AH, dopt, ropt);
Assert(AH->connection != NULL);
- WaitForCommands(AH, pipefd);
+ WaitForCommands(AH, dopt, pipefd);
closesocket(pipefd[PIPE_READ]);
closesocket(pipefd[PIPE_WRITE]);
@@ -481,7 +483,7 @@ init_spawned_worker_win32(WorkerInfo *wi)
* of threads while it does a fork() on Unix.
*/
ParallelState *
-ParallelBackupStart(ArchiveHandle *AH, RestoreOptions *ropt)
+ParallelBackupStart(ArchiveHandle *AH, DumpOptions *dopt, RestoreOptions *ropt)
{
ParallelState *pstate;
int i;
@@ -598,7 +600,7 @@ ParallelBackupStart(ArchiveHandle *AH, RestoreOptions *ropt)
closesocket(pstate->parallelSlot[j].pipeWrite);
}
- SetupWorker(pstate->parallelSlot[i].args->AH, pipefd, i, ropt);
+ SetupWorker(pstate->parallelSlot[i].args->AH, pipefd, i, dopt, ropt);
exit(0);
}
@@ -856,7 +858,7 @@ lockTableNoWait(ArchiveHandle *AH, TocEntry *te)
* exit.
*/
static void
-WaitForCommands(ArchiveHandle *AH, int pipefd[2])
+WaitForCommands(ArchiveHandle *AH, DumpOptions *dopt, int pipefd[2])
{
char *command;
DumpId dumpId;
@@ -896,7 +898,7 @@ WaitForCommands(ArchiveHandle *AH, int pipefd[2])
* The message we return here has been pg_malloc()ed and we are
* responsible for free()ing it.
*/
- str = (AH->WorkerJobDumpPtr) (AH, te);
+ str = (AH->WorkerJobDumpPtr) (AH, dopt, te);
Assert(AH->connection != NULL);
sendMessageToMaster(pipefd, str);
free(str);
diff --git a/src/bin/pg_dump/parallel.h b/src/bin/pg_dump/parallel.h
index 7a32a9b..81a823d 100644
--- a/src/bin/pg_dump/parallel.h
+++ b/src/bin/pg_dump/parallel.h
@@ -80,6 +80,7 @@ extern void EnsureIdleWorker(struct _archiveHandle * AH, ParallelState *pstate);
extern void EnsureWorkersFinished(struct _archiveHandle * AH, ParallelState *pstate);
extern ParallelState *ParallelBackupStart(struct _archiveHandle * AH,
+ DumpOptions *dopt,
RestoreOptions *ropt);
extern void DispatchJobForTocEntry(struct _archiveHandle * AH,
ParallelState *pstate,
diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index 921bc1b..915cd50 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -98,8 +98,6 @@ struct Archive
/* The rest is private */
};
-typedef int (*DataDumperPtr) (Archive *AH, void *userArg);
-
typedef struct _restoreOptions
{
int createDB; /* Issue commands to create the database */
@@ -109,17 +107,24 @@ typedef struct _restoreOptions
* restore */
int use_setsessauth;/* Use SET SESSION AUTHORIZATION commands
* instead of OWNER TO */
- int no_security_labels; /* Skip security label entries */
char *superuser; /* Username to use as superuser */
char *use_role; /* Issue SET ROLE to this */
int dropSchema;
+ int disable_dollar_quoting;
+ int dump_inserts;
+ int column_inserts;
int if_exists;
+ int no_security_labels; /* Skip security label entries */
+
const char *filename;
int dataOnly;
int schemaOnly;
int dumpSections;
int verbose;
int aclsSkip;
+ const char *lockWaitTimeout;
+ int include_everything;
+
int tocSummary;
char *tocFile;
int format;
@@ -153,7 +158,51 @@ typedef struct _restoreOptions
int enable_row_security;
} RestoreOptions;
-typedef void (*SetupWorkerPtr) (Archive *AH, RestoreOptions *ropt);
+typedef struct _dumpOptions
+{
+ const char *dbname;
+ const char *pghost;
+ const char *pgport;
+ const char *username;
+ bool oids;
+
+ int binary_upgrade;
+
+ /* various user-settable parameters */
+ bool schemaOnly;
+ bool dataOnly;
+ int dumpSections; /* bitmask of chosen sections */
+ bool aclsSkip;
+ const char *lockWaitTimeout;
+
+ /* flags for various command-line long options */
+ int disable_dollar_quoting;
+ int dump_inserts;
+ int column_inserts;
+ int if_exists;
+ int no_security_labels;
+ int no_synchronized_snapshots;
+ int no_unlogged_table_data;
+ int serializable_deferrable;
+ int quote_all_identifiers;
+ int disable_triggers;
+ int outputNoTablespaces;
+ int use_setsessauth;
+ int enable_row_security;
+
+ /* default, if no "inclusion" switches appear, is to dump everything */
+ bool include_everything;
+
+ int outputClean;
+ int outputCreateDB;
+ bool outputBlobs;
+ int outputNoOwner;
+ char *outputSuperuser;
+} DumpOptions;
+
+typedef int (*DataDumperPtr) (Archive *AH, DumpOptions *dopt, void *userArg);
+
+typedef void (*SetupWorkerPtr) (Archive *AH, DumpOptions *dopt, RestoreOptions *ropt);
/*
* Main archiver interface.
@@ -186,7 +235,7 @@ extern void WriteData(Archive *AH, const void *data, size_t dLen);
extern int StartBlob(Archive *AH, Oid oid);
extern int EndBlob(Archive *AH, Oid oid);
-extern void CloseArchive(Archive *AH);
+extern void CloseArchive(Archive *AH, DumpOptions *dopt);
extern void SetArchiveRestoreOptions(Archive *AH, RestoreOptions *ropt);
@@ -205,6 +254,9 @@ extern void PrintTOCSummary(Archive *AH, RestoreOptions *ropt);
extern RestoreOptions *NewRestoreOptions(void);
+extern DumpOptions *NewDumpOptions(void);
+extern DumpOptions *dumpOptionsFromRestoreOptions(RestoreOptions *ropt);
+
/* Rearrange and filter TOC entries */
extern void SortTocFromFile(Archive *AHX, RestoreOptions *ropt);
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 1303ef6..71ac6e5 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -107,6 +107,62 @@ static void mark_create_done(ArchiveHandle *AH, TocEntry *te);
static void inhibit_data_for_failed_table(ArchiveHandle *AH, TocEntry *te);
/*
+ * Allocate a new DumpOptions block.
+ * This is mainly so we can initialize it, but also for future expansion.
+ * We pg_malloc0 the structure, so we don't need to initialize whatever is
+ * 0, NULL or false anyway.
+ */
+DumpOptions *
+NewDumpOptions(void)
+{
+ DumpOptions *opts;
+
+ opts = (DumpOptions *) pg_malloc0(sizeof(DumpOptions));
+
+ /* set any fields that shouldn't default to zeroes */
+ opts->include_everything = true;
+ opts->dumpSections = DUMP_UNSECTIONED;
+
+ return opts;
+}
+
+/*
+ * We do a plaintext dump by printing out the restore command that would create
+ * a certain object. Since in those functions we only have RestoreOptions, we
+ * crate ad-hoc DumpOptions.
+ */
+DumpOptions *
+dumpOptionsFromRestoreOptions(RestoreOptions *ropt)
+{
+ DumpOptions *dopt = NewDumpOptions();
+
+ /* this is the inverse of what's at the end of pg_dump.c's main() */
+ dopt->outputClean = ropt->dropSchema;
+ dopt->dataOnly = ropt->dataOnly;
+ dopt->schemaOnly = ropt->schemaOnly;
+ dopt->if_exists = ropt->if_exists;
+ dopt->column_inserts = ropt->column_inserts;
+ dopt->dumpSections = ropt->dumpSections;
+ dopt->aclsSkip = ropt->aclsSkip;
+ dopt->outputSuperuser = ropt->superuser;
+ dopt->outputCreateDB = ropt->createDB;
+ dopt->outputNoOwner = ropt->noOwner;
+ dopt->outputNoTablespaces = ropt->noTablespace;
+ dopt->disable_triggers = ropt->disable_triggers;
+ dopt->use_setsessauth = ropt->use_setsessauth;
+
+ dopt->disable_dollar_quoting = ropt->disable_dollar_quoting;
+ dopt->dump_inserts = ropt->dump_inserts;
+ dopt->no_security_labels = ropt->no_security_labels;
+ dopt->lockWaitTimeout = ropt->lockWaitTimeout;
+ dopt->include_everything = ropt->include_everything;
+ dopt->enable_row_security = ropt->enable_row_security;
+
+ return dopt;
+}
+
+
+/*
* Wrapper functions.
*
* The objective it to make writing new formats and dumpers as simple
@@ -120,7 +176,7 @@ static void inhibit_data_for_failed_table(ArchiveHandle *AH, TocEntry *te);
* setup doesn't need to know anything much, so it's defined here.
*/
static void
-setupRestoreWorker(Archive *AHX, RestoreOptions *ropt)
+setupRestoreWorker(Archive *AHX, DumpOptions *dopt, RestoreOptions *ropt)
{
ArchiveHandle *AH = (ArchiveHandle *) AHX;
@@ -152,12 +208,12 @@ OpenArchive(const char *FileSpec, const ArchiveFormat fmt)
/* Public */
void
-CloseArchive(Archive *AHX)
+CloseArchive(Archive *AHX, DumpOptions *dopt)
{
int res = 0;
ArchiveHandle *AH = (ArchiveHandle *) AHX;
- (*AH->ClosePtr) (AH);
+ (*AH->ClosePtr) (AH, dopt);
/* Close the output */
if (AH->gzOut)
@@ -548,7 +604,7 @@ RestoreArchive(Archive *AHX)
Assert(AH->connection == NULL);
/* ParallelBackupStart() will actually fork the processes */
- pstate = ParallelBackupStart(AH, ropt);
+ pstate = ParallelBackupStart(AH, NULL, ropt);
restore_toc_entries_parallel(AH, pstate, &pending_list);
ParallelBackupEnd(AH, pstate);
@@ -2240,7 +2296,7 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
}
void
-WriteDataChunks(ArchiveHandle *AH, ParallelState *pstate)
+WriteDataChunks(ArchiveHandle *AH, DumpOptions *dopt, ParallelState *pstate)
{
TocEntry *te;
@@ -2263,13 +2319,13 @@ WriteDataChunks(ArchiveHandle *AH, ParallelState *pstate)
DispatchJobForTocEntry(AH, pstate, te, ACT_DUMP);
}
else
- WriteDataChunksForTocEntry(AH, te);
+ WriteDataChunksForTocEntry(AH, dopt, te);
}
EnsureWorkersFinished(AH, pstate);
}
void
-WriteDataChunksForTocEntry(ArchiveHandle *AH, TocEntry *te)
+WriteDataChunksForTocEntry(ArchiveHandle *AH, DumpOptions *dopt, TocEntry *te)
{
StartDataPtr startPtr;
EndDataPtr endPtr;
@@ -2293,7 +2349,7 @@ WriteDataChunksForTocEntry(ArchiveHandle *AH, TocEntry *te)
/*
* The user-provided DataDumper routine needs to call AH->WriteData
*/
- (*te->dataDumper) ((Archive *) AH, te->dataDumperArg);
+ (*te->dataDumper) ((Archive *) AH, dopt, te->dataDumperArg);
if (endPtr != NULL)
(*endPtr) (AH, te);
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index c163f29..2dac52c 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -139,7 +139,7 @@ typedef enum T_Action
ACT_RESTORE
} T_Action;
-typedef void (*ClosePtr) (struct _archiveHandle * AH);
+typedef void (*ClosePtr) (struct _archiveHandle * AH, DumpOptions *dopt);
typedef void (*ReopenPtr) (struct _archiveHandle * AH);
typedef void (*ArchiveEntryPtr) (struct _archiveHandle * AH, struct _tocEntry * te);
@@ -166,7 +166,7 @@ typedef void (*ClonePtr) (struct _archiveHandle * AH);
typedef void (*DeClonePtr) (struct _archiveHandle * AH);
typedef char *(*WorkerJobRestorePtr) (struct _archiveHandle * AH, struct _tocEntry * te);
-typedef char *(*WorkerJobDumpPtr) (struct _archiveHandle * AH, struct _tocEntry * te);
+typedef char *(*WorkerJobDumpPtr) (struct _archiveHandle * AH, DumpOptions *dopt, struct _tocEntry * te);
typedef char *(*MasterStartParallelItemPtr) (struct _archiveHandle * AH, struct _tocEntry * te,
T_Action act);
typedef int (*MasterEndParallelItemPtr) (struct _archiveHandle * AH, struct _tocEntry * te,
@@ -389,8 +389,8 @@ extern void WriteHead(ArchiveHandle *AH);
extern void ReadHead(ArchiveHandle *AH);
extern void WriteToc(ArchiveHandle *AH);
extern void ReadToc(ArchiveHandle *AH);
-extern void WriteDataChunks(ArchiveHandle *AH, struct ParallelState *pstate);
-extern void WriteDataChunksForTocEntry(ArchiveHandle *AH, TocEntry *te);
+extern void WriteDataChunks(ArchiveHandle *AH, DumpOptions *dopt, struct ParallelState *pstate);
+extern void WriteDataChunksForTocEntry(ArchiveHandle *AH, DumpOptions *dopt, TocEntry *te);
extern ArchiveHandle *CloneArchive(ArchiveHandle *AH);
extern void DeCloneArchive(ArchiveHandle *AH);
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 06cd0a7..6f29430 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -41,7 +41,7 @@ static int _WriteByte(ArchiveHandle *AH, const int i);
static int _ReadByte(ArchiveHandle *);
static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len);
static void _ReadBuf(ArchiveHandle *AH, void *buf, size_t len);
-static void _CloseArchive(ArchiveHandle *AH);
+static void _CloseArchive(ArchiveHandle *AH, DumpOptions *dopt);
static void _ReopenArchive(ArchiveHandle *AH);
static void _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt);
static void _WriteExtraToc(ArchiveHandle *AH, TocEntry *te);
@@ -687,14 +687,14 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
* the process of saving it to files. No data should be written prior
* to this point, since the user could sort the TOC after creating it.
*
- * If an archive is to be written, this toutine must call:
+ * If an archive is to be written, this routine must call:
* WriteHead to save the archive header
* WriteToc to save the TOC entries
* WriteDataChunks to save all DATA & BLOBs.
*
*/
static void
-_CloseArchive(ArchiveHandle *AH)
+_CloseArchive(ArchiveHandle *AH, DumpOptions *dopt)
{
lclContext *ctx = (lclContext *) AH->formatData;
pgoff_t tpos;
@@ -709,7 +709,7 @@ _CloseArchive(ArchiveHandle *AH)
strerror(errno));
WriteToc(AH);
ctx->dataStart = _getFilePos(AH, ctx);
- WriteDataChunks(AH, NULL);
+ WriteDataChunks(AH, dopt, NULL);
/*
* If possible, re-write the TOC in order to update the data offset
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index 39e29d8..01b0e97 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -71,7 +71,7 @@ static int _WriteByte(ArchiveHandle *AH, const int i);
static int _ReadByte(ArchiveHandle *);
static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len);
static void _ReadBuf(ArchiveHandle *AH, void *buf, size_t len);
-static void _CloseArchive(ArchiveHandle *AH);
+static void _CloseArchive(ArchiveHandle *AH, DumpOptions *dopt);
static void _ReopenArchive(ArchiveHandle *AH);
static void _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt);
@@ -92,7 +92,7 @@ static char *_MasterStartParallelItem(ArchiveHandle *AH, TocEntry *te, T_Action
static int _MasterEndParallelItem(ArchiveHandle *AH, TocEntry *te,
const char *str, T_Action act);
static char *_WorkerJobRestoreDirectory(ArchiveHandle *AH, TocEntry *te);
-static char *_WorkerJobDumpDirectory(ArchiveHandle *AH, TocEntry *te);
+static char *_WorkerJobDumpDirectory(ArchiveHandle *AH, DumpOptions *dopt, TocEntry *te);
static void setFilePath(ArchiveHandle *AH, char *buf,
const char *relativeFilename);
@@ -566,7 +566,7 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
* WriteDataChunks to save all DATA & BLOBs.
*/
static void
-_CloseArchive(ArchiveHandle *AH)
+_CloseArchive(ArchiveHandle *AH, DumpOptions *dopt)
{
lclContext *ctx = (lclContext *) AH->formatData;
@@ -578,7 +578,7 @@ _CloseArchive(ArchiveHandle *AH)
setFilePath(AH, fname, "toc.dat");
/* this will actually fork the processes for a parallel backup */
- ctx->pstate = ParallelBackupStart(AH, NULL);
+ ctx->pstate = ParallelBackupStart(AH, dopt, NULL);
/* The TOC is always created uncompressed */
tocFH = cfopen_write(fname, PG_BINARY_W, 0);
@@ -599,7 +599,7 @@ _CloseArchive(ArchiveHandle *AH)
if (cfclose(tocFH) != 0)
exit_horribly(modulename, "could not close TOC file: %s\n",
strerror(errno));
- WriteDataChunks(AH, ctx->pstate);
+ WriteDataChunks(AH, dopt, ctx->pstate);
ParallelBackupEnd(AH, ctx->pstate);
}
@@ -790,7 +790,7 @@ _MasterStartParallelItem(ArchiveHandle *AH, TocEntry *te, T_Action act)
* function of the respective dump format.
*/
static char *
-_WorkerJobDumpDirectory(ArchiveHandle *AH, TocEntry *te)
+_WorkerJobDumpDirectory(ArchiveHandle *AH, DumpOptions *dopt, TocEntry *te)
{
/*
* short fixed-size string + some ID so far, this needs to be malloc'ed
@@ -809,7 +809,7 @@ _WorkerJobDumpDirectory(ArchiveHandle *AH, TocEntry *te)
* succeed... A failure will be detected by the parent when the child dies
* unexpectedly.
*/
- WriteDataChunksForTocEntry(AH, te);
+ WriteDataChunksForTocEntry(AH, dopt, te);
snprintf(buf, buflen, "OK DUMP %d", te->dumpId);
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index 3bce588..430ad41 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -35,7 +35,7 @@ static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen);
static void _EndData(ArchiveHandle *AH, TocEntry *te);
static int _WriteByte(ArchiveHandle *AH, const int i);
static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len);
-static void _CloseArchive(ArchiveHandle *AH);
+static void _CloseArchive(ArchiveHandle *AH, DumpOptions *dopt);
static void _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt);
static void _StartBlobs(ArchiveHandle *AH, TocEntry *te);
static void _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid);
@@ -198,12 +198,16 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt)
{
if (te->dataDumper)
{
+ DumpOptions *dopt;
+
AH->currToc = te;
if (strcmp(te->desc, "BLOBS") == 0)
_StartBlobs(AH, te);
- (*te->dataDumper) ((Archive *) AH, te->dataDumperArg);
+ dopt = dumpOptionsFromRestoreOptions(ropt);
+ (*te->dataDumper) ((Archive *) AH, dopt, te->dataDumperArg);
+ free(dopt);
if (strcmp(te->desc, "BLOBS") == 0)
_EndBlobs(AH, te);
@@ -227,7 +231,7 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len)
}
static void
-_CloseArchive(ArchiveHandle *AH)
+_CloseArchive(ArchiveHandle *AH, DumpOptions *dopt)
{
/* Nothing to do */
}
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index 457b742..1c5056c 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -48,7 +48,7 @@ static int _WriteByte(ArchiveHandle *AH, const int i);
static int _ReadByte(ArchiveHandle *);
static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len);
static void _ReadBuf(ArchiveHandle *AH, void *buf, size_t len);
-static void _CloseArchive(ArchiveHandle *AH);
+static void _CloseArchive(ArchiveHandle *AH, DumpOptions *dopt);
static void _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt);
static void _WriteExtraToc(ArchiveHandle *AH, TocEntry *te);
static void _ReadExtraToc(ArchiveHandle *AH, TocEntry *te);
@@ -827,7 +827,7 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
}
static void
-_CloseArchive(ArchiveHandle *AH)
+_CloseArchive(ArchiveHandle *AH, DumpOptions *dopt)
{
lclContext *ctx = (lclContext *) AH->formatData;
TAR_MEMBER *th;
@@ -850,7 +850,7 @@ _CloseArchive(ArchiveHandle *AH)
/*
* Now send the data (tables & blobs)
*/
- WriteDataChunks(AH, NULL);
+ WriteDataChunks(AH, dopt, NULL);
/*
* Now this format wants to append a script which does a full restore
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 1a9e82e..7240ee3 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -85,13 +85,6 @@ typedef struct
bool g_verbose; /* User wants verbose narration of our
* activities. */
-/* various user-settable parameters */
-static bool schemaOnly;
-static bool dataOnly;
-static int dumpSections; /* bitmask of chosen sections */
-static bool aclsSkip;
-static const char *lockWaitTimeout;
-
/* subquery used to convert user ID (eg, datdba) to user name */
static const char *username_subquery;
@@ -116,8 +109,6 @@ static SimpleOidList table_exclude_oids = {NULL, NULL};
static SimpleStringList tabledata_exclude_patterns = {NULL, NULL};
static SimpleOidList tabledata_exclude_oids = {NULL, NULL};
-/* default, if no "inclusion" switches appear, is to dump everything */
-static bool include_everything = true;
char g_opaque_type[10]; /* name for the opaque type */
@@ -127,22 +118,9 @@ char g_comment_end[10];
static const CatalogId nilCatalogId = {0, 0};
-/* flags for various command-line long options */
-static int binary_upgrade = 0;
-static int disable_dollar_quoting = 0;
-static int dump_inserts = 0;
-static int column_inserts = 0;
-static int if_exists = 0;
-static int no_security_labels = 0;
-static int no_synchronized_snapshots = 0;
-static int no_unlogged_table_data = 0;
-static int serializable_deferrable = 0;
-static int enable_row_security = 0;
-
-
static void help(const char *progname);
-static void setup_connection(Archive *AH, const char *dumpencoding,
- char *use_role);
+static void setup_connection(Archive *AH, DumpOptions *dopt,
+ const char *dumpencoding, char *use_role);
static ArchiveFormat parseArchiveFormat(const char *format, ArchiveMode *mode);
static void expand_schema_name_patterns(Archive *fout,
SimpleStringList *patterns,
@@ -151,64 +129,64 @@ static void expand_table_name_patterns(Archive *fout,
SimpleStringList *patterns,
SimpleOidList *oids);
static NamespaceInfo *findNamespace(Archive *fout, Oid nsoid, Oid objoid);
-static void dumpTableData(Archive *fout, TableDataInfo *tdinfo);
+static void dumpTableData(Archive *fout, DumpOptions *dopt, TableDataInfo *tdinfo);
static void refreshMatViewData(Archive *fout, TableDataInfo *tdinfo);
static void guessConstraintInheritance(TableInfo *tblinfo, int numTables);
-static void dumpComment(Archive *fout, const char *target,
+static void dumpComment(Archive *fout, DumpOptions *dopt, const char *target,
const char *namespace, const char *owner,
CatalogId catalogId, int subid, DumpId dumpId);
static int findComments(Archive *fout, Oid classoid, Oid objoid,
CommentItem **items);
static int collectComments(Archive *fout, CommentItem **items);
-static void dumpSecLabel(Archive *fout, const char *target,
+static void dumpSecLabel(Archive *fout, DumpOptions *dopt, const char *target,
const char *namespace, const char *owner,
CatalogId catalogId, int subid, DumpId dumpId);
static int findSecLabels(Archive *fout, Oid classoid, Oid objoid,
SecLabelItem **items);
static int collectSecLabels(Archive *fout, SecLabelItem **items);
-static void dumpDumpableObject(Archive *fout, DumpableObject *dobj);
-static void dumpNamespace(Archive *fout, NamespaceInfo *nspinfo);
-static void dumpExtension(Archive *fout, ExtensionInfo *extinfo);
-static void dumpType(Archive *fout, TypeInfo *tyinfo);
-static void dumpBaseType(Archive *fout, TypeInfo *tyinfo);
-static void dumpEnumType(Archive *fout, TypeInfo *tyinfo);
-static void dumpRangeType(Archive *fout, TypeInfo *tyinfo);
-static void dumpDomain(Archive *fout, TypeInfo *tyinfo);
-static void dumpCompositeType(Archive *fout, TypeInfo *tyinfo);
+static void dumpDumpableObject(Archive *fout, DumpOptions *dopt, DumpableObject *dobj);
+static void dumpNamespace(Archive *fout, DumpOptions *dopt, NamespaceInfo *nspinfo);
+static void dumpExtension(Archive *fout, DumpOptions *dopt, ExtensionInfo *extinfo);
+static void dumpType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo);
+static void dumpBaseType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo);
+static void dumpEnumType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo);
+static void dumpRangeType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo);
+static void dumpDomain(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo);
+static void dumpCompositeType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo);
static void dumpCompositeTypeColComments(Archive *fout, TypeInfo *tyinfo);
-static void dumpShellType(Archive *fout, ShellTypeInfo *stinfo);
-static void dumpProcLang(Archive *fout, ProcLangInfo *plang);
-static void dumpFunc(Archive *fout, FuncInfo *finfo);
-static void dumpCast(Archive *fout, CastInfo *cast);
-static void dumpOpr(Archive *fout, OprInfo *oprinfo);
-static void dumpOpclass(Archive *fout, OpclassInfo *opcinfo);
-static void dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo);
-static void dumpCollation(Archive *fout, CollInfo *convinfo);
-static void dumpConversion(Archive *fout, ConvInfo *convinfo);
-static void dumpRule(Archive *fout, RuleInfo *rinfo);
-static void dumpAgg(Archive *fout, AggInfo *agginfo);
-static void dumpTrigger(Archive *fout, TriggerInfo *tginfo);
-static void dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo);
-static void dumpTable(Archive *fout, TableInfo *tbinfo);
-static void dumpTableSchema(Archive *fout, TableInfo *tbinfo);
-static void dumpAttrDef(Archive *fout, AttrDefInfo *adinfo);
-static void dumpSequence(Archive *fout, TableInfo *tbinfo);
+static void dumpShellType(Archive *fout, DumpOptions *dopt, ShellTypeInfo *stinfo);
+static void dumpProcLang(Archive *fout, DumpOptions *dopt, ProcLangInfo *plang);
+static void dumpFunc(Archive *fout, DumpOptions *dopt, FuncInfo *finfo);
+static void dumpCast(Archive *fout, DumpOptions *dopt, CastInfo *cast);
+static void dumpOpr(Archive *fout, DumpOptions *dopt, OprInfo *oprinfo);
+static void dumpOpclass(Archive *fout, DumpOptions *dopt, OpclassInfo *opcinfo);
+static void dumpOpfamily(Archive *fout, DumpOptions *dopt, OpfamilyInfo *opfinfo);
+static void dumpCollation(Archive *fout, DumpOptions *dopt, CollInfo *convinfo);
+static void dumpConversion(Archive *fout, DumpOptions *dopt, ConvInfo *convinfo);
+static void dumpRule(Archive *fout, DumpOptions *dopt, RuleInfo *rinfo);
+static void dumpAgg(Archive *fout, DumpOptions *dopt, AggInfo *agginfo);
+static void dumpTrigger(Archive *fout, DumpOptions *dopt, TriggerInfo *tginfo);
+static void dumpEventTrigger(Archive *fout, DumpOptions *dopt, EventTriggerInfo *evtinfo);
+static void dumpTable(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo);
+static void dumpTableSchema(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo);
+static void dumpAttrDef(Archive *fout, DumpOptions *dopt, AttrDefInfo *adinfo);
+static void dumpSequence(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo);
static void dumpSequenceData(Archive *fout, TableDataInfo *tdinfo);
-static void dumpIndex(Archive *fout, IndxInfo *indxinfo);
-static void dumpConstraint(Archive *fout, ConstraintInfo *coninfo);
-static void dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo);
-static void dumpTSParser(Archive *fout, TSParserInfo *prsinfo);
-static void dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo);
-static void dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo);
-static void dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo);
-static void dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo);
-static void dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo);
+static void dumpIndex(Archive *fout, DumpOptions *dopt, IndxInfo *indxinfo);
+static void dumpConstraint(Archive *fout, DumpOptions *dopt, ConstraintInfo *coninfo);
+static void dumpTableConstraintComment(Archive *fout, DumpOptions *dopt, ConstraintInfo *coninfo);
+static void dumpTSParser(Archive *fout, DumpOptions *dopt, TSParserInfo *prsinfo);
+static void dumpTSDictionary(Archive *fout, DumpOptions *dopt, TSDictInfo *dictinfo);
+static void dumpTSTemplate(Archive *fout, DumpOptions *dopt, TSTemplateInfo *tmplinfo);
+static void dumpTSConfig(Archive *fout, DumpOptions *dopt, TSConfigInfo *cfginfo);
+static void dumpForeignDataWrapper(Archive *fout, DumpOptions *dopt, FdwInfo *fdwinfo);
+static void dumpForeignServer(Archive *fout, DumpOptions *dopt, ForeignServerInfo *srvinfo);
static void dumpUserMappings(Archive *fout,
const char *servername, const char *namespace,
const char *owner, CatalogId catalogId, DumpId dumpId);
-static void dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo);
+static void dumpDefaultACL(Archive *fout, DumpOptions *dopt, DefaultACLInfo *daclinfo);
-static void dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
+static void dumpACL(Archive *fout, DumpOptions *dopt, CatalogId objCatId, DumpId objDumpId,
const char *type, const char *name, const char *subname,
const char *tag, const char *nspname, const char *owner,
const char *acls);
@@ -223,8 +201,8 @@ static void addBoundaryDependencies(DumpableObject **dobjs, int numObjs,
DumpableObject *boundaryObjs);
static void getDomainConstraints(Archive *fout, TypeInfo *tyinfo);
-static void getTableData(TableInfo *tblinfo, int numTables, bool oids);
-static void makeTableDataInfo(TableInfo *tbinfo, bool oids);
+static void getTableData(DumpOptions *dopt, TableInfo *tblinfo, int numTables, bool oids);
+static void makeTableDataInfo(DumpOptions *dopt, TableInfo *tbinfo, bool oids);
static void buildMatViewRefreshDependencies(Archive *fout);
static void getTableDataFKConstraints(void);
static char *format_function_arguments(FuncInfo *finfo, char *funcargs,
@@ -246,10 +224,10 @@ static void selectSourceSchema(Archive *fout, const char *schemaName);
static char *getFormattedTypeName(Archive *fout, Oid oid, OidOptions opts);
static char *myFormatType(const char *typname, int32 typmod);
static void getBlobs(Archive *fout);
-static void dumpBlob(Archive *fout, BlobInfo *binfo);
-static int dumpBlobs(Archive *fout, void *arg);
-static void dumpRowSecurity(Archive *fout, RowSecurityInfo *rsinfo);
-static void dumpDatabase(Archive *AH);
+static void dumpBlob(Archive *fout, DumpOptions *dopt, BlobInfo *binfo);
+static int dumpBlobs(Archive *fout, DumpOptions *dopt, void *arg);
+static void dumpRowSecurity(Archive *fout, DumpOptions *dopt, RowSecurityInfo *rsinfo);
+static void dumpDatabase(Archive *AH, DumpOptions *dopt);
static void dumpEncoding(Archive *AH);
static void dumpStdStrings(Archive *AH);
static void binary_upgrade_set_type_oids_by_type_oid(Archive *fout,
@@ -266,7 +244,7 @@ static const char *getAttrName(int attrnum, TableInfo *tblInfo);
static const char *fmtCopyColumnList(const TableInfo *ti, PQExpBuffer buffer);
static char *get_synchronized_snapshot(Archive *fout);
static PGresult *ExecuteSqlQueryForSingleRow(Archive *fout, char *query);
-static void setupDumpWorker(Archive *AHX, RestoreOptions *ropt);
+static void setupDumpWorker(Archive *AHX, DumpOptions *dopt, RestoreOptions *ropt);
int
@@ -275,39 +253,27 @@ main(int argc, char **argv)
int c;
const char *filename = NULL;
const char *format = "p";
- const char *dbname = NULL;
- const char *pghost = NULL;
- const char *pgport = NULL;
- const char *username = NULL;
- const char *dumpencoding = NULL;
- bool oids = false;
TableInfo *tblinfo;
int numTables;
DumpableObject **dobjs;
int numObjs;
DumpableObject *boundaryObjs;
int i;
+ int optindex;
+ RestoreOptions *ropt;
+ Archive *fout; /* the script file */
+ const char *dumpencoding = NULL;
+ char *use_role = NULL;
int numWorkers = 1;
enum trivalue prompt_password = TRI_DEFAULT;
int compressLevel = -1;
int plainText = 0;
- int outputClean = 0;
- int outputCreateDB = 0;
- bool outputBlobs = false;
- int outputNoOwner = 0;
- char *outputSuperuser = NULL;
- char *use_role = NULL;
- int optindex;
- RestoreOptions *ropt;
ArchiveFormat archiveFormat = archUnknown;
- ArchiveMode archiveMode;
- Archive *fout; /* the script file */
+ ArchiveMode archiveMode;
- static int disable_triggers = 0;
- static int outputNoTablespaces = 0;
- static int use_setsessauth = 0;
+ DumpOptions *dopt = NewDumpOptions();
- static struct option long_options[] = {
+ struct option long_options[] = {
{"data-only", no_argument, NULL, 'a'},
{"blobs", no_argument, NULL, 'b'},
{"clean", no_argument, NULL, 'c'},
@@ -342,25 +308,25 @@ main(int argc, char **argv)
/*
* the following options don't have an equivalent short option letter
*/
- {"attribute-inserts", no_argument, &column_inserts, 1},
- {"binary-upgrade", no_argument, &binary_upgrade, 1},
- {"column-inserts", no_argument, &column_inserts, 1},
- {"disable-dollar-quoting", no_argument, &disable_dollar_quoting, 1},
- {"disable-triggers", no_argument, &disable_triggers, 1},
- {"enable-row-security", no_argument, &enable_row_security, 1},
+ {"attribute-inserts", no_argument, &dopt->column_inserts, 1},
+ {"binary-upgrade", no_argument, &dopt->binary_upgrade, 1},
+ {"column-inserts", no_argument, &dopt->column_inserts, 1},
+ {"disable-dollar-quoting", no_argument, &dopt->disable_dollar_quoting, 1},
+ {"disable-triggers", no_argument, &dopt->disable_triggers, 1},
+ {"enable-row-security", no_argument, &dopt->enable_row_security, 1},
{"exclude-table-data", required_argument, NULL, 4},
- {"if-exists", no_argument, &if_exists, 1},
- {"inserts", no_argument, &dump_inserts, 1},
+ {"if-exists", no_argument, &dopt->if_exists, 1},
+ {"inserts", no_argument, &dopt->dump_inserts, 1},
{"lock-wait-timeout", required_argument, NULL, 2},
- {"no-tablespaces", no_argument, &outputNoTablespaces, 1},
+ {"no-tablespaces", no_argument, &dopt->outputNoTablespaces, 1},
{"quote-all-identifiers", no_argument, "e_all_identifiers, 1},
{"role", required_argument, NULL, 3},
{"section", required_argument, NULL, 5},
- {"serializable-deferrable", no_argument, &serializable_deferrable, 1},
- {"use-set-session-authorization", no_argument, &use_setsessauth, 1},
- {"no-security-labels", no_argument, &no_security_labels, 1},
- {"no-synchronized-snapshots", no_argument, &no_synchronized_snapshots, 1},
- {"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
+ {"serializable-deferrable", no_argument, &dopt->serializable_deferrable, 1},
+ {"use-set-session-authorization", no_argument, &dopt->use_setsessauth, 1},
+ {"no-security-labels", no_argument, &dopt->no_security_labels, 1},
+ {"no-synchronized-snapshots", no_argument, &dopt->no_synchronized_snapshots, 1},
+ {"no-unlogged-table-data", no_argument, &dopt->no_unlogged_table_data, 1},
{NULL, 0, NULL, 0}
};
@@ -379,10 +345,6 @@ main(int argc, char **argv)
g_comment_end[0] = '\0';
strcpy(g_opaque_type, "opaque");
- dataOnly = schemaOnly = false;
- dumpSections = DUMP_UNSECTIONED;
- lockWaitTimeout = NULL;
-
progname = get_progname(argv[0]);
/* Set default options based on progname */
@@ -409,23 +371,23 @@ main(int argc, char **argv)
switch (c)
{
case 'a': /* Dump data only */
- dataOnly = true;
+ dopt->dataOnly = true;
break;
case 'b': /* Dump blobs */
- outputBlobs = true;
+ dopt->outputBlobs = true;
break;
case 'c': /* clean (i.e., drop) schema prior to create */
- outputClean = 1;
+ dopt->outputClean = 1;
break;
case 'C': /* Create DB */
- outputCreateDB = 1;
+ dopt->outputCreateDB = 1;
break;
case 'd': /* database name */
- dbname = pg_strdup(optarg);
+ dopt->dbname = pg_strdup(optarg);
break;
case 'E': /* Dump encoding */
@@ -441,7 +403,7 @@ main(int argc, char **argv)
break;
case 'h': /* server host */
- pghost = pg_strdup(optarg);
+ dopt->pghost = pg_strdup(optarg);
break;
case 'i':
@@ -454,7 +416,7 @@ main(int argc, char **argv)
case 'n': /* include schema(s) */
simple_string_list_append(&schema_include_patterns, optarg);
- include_everything = false;
+ dopt->include_everything = false;
break;
case 'N': /* exclude schema(s) */
@@ -462,15 +424,15 @@ main(int argc, char **argv)
break;
case 'o': /* Dump oids */
- oids = true;
+ dopt->oids = true;
break;
case 'O': /* Don't reconnect to match owner */
- outputNoOwner = 1;
+ dopt->outputNoOwner = 1;
break;
case 'p': /* server port */
- pgport = pg_strdup(optarg);
+ dopt->pgport = pg_strdup(optarg);
break;
case 'R':
@@ -478,16 +440,16 @@ main(int argc, char **argv)
break;
case 's': /* dump schema only */
- schemaOnly = true;
+ dopt->schemaOnly = true;
break;
case 'S': /* Username for superuser in plain text output */
- outputSuperuser = pg_strdup(optarg);
+ dopt->outputSuperuser = pg_strdup(optarg);
break;
case 't': /* include table(s) */
simple_string_list_append(&table_include_patterns, optarg);
- include_everything = false;
+ dopt->include_everything = false;
break;
case 'T': /* exclude table(s) */
@@ -495,7 +457,7 @@ main(int argc, char **argv)
break;
case 'U':
- username = pg_strdup(optarg);
+ dopt->username = pg_strdup(optarg);
break;
case 'v': /* verbose */
@@ -511,7 +473,7 @@ main(int argc, char **argv)
break;
case 'x': /* skip ACL dump */
- aclsSkip = true;
+ dopt->aclsSkip = true;
break;
case 'Z': /* Compression Level */
@@ -523,7 +485,7 @@ main(int argc, char **argv)
break;
case 2: /* lock-wait-timeout */
- lockWaitTimeout = pg_strdup(optarg);
+ dopt->lockWaitTimeout = pg_strdup(optarg);
break;
case 3: /* SET ROLE */
@@ -535,7 +497,7 @@ main(int argc, char **argv)
break;
case 5: /* section */
- set_dump_section(optarg, &dumpSections);
+ set_dump_section(optarg, &dopt->dumpSections);
break;
default:
@@ -548,8 +510,8 @@ main(int argc, char **argv)
* Non-option argument specifies database name as long as it wasn't
* already specified with -d / --dbname
*/
- if (optind < argc && dbname == NULL)
- dbname = argv[optind++];
+ if (optind < argc && dopt->dbname == NULL)
+ dopt->dbname = argv[optind++];
/* Complain if any arguments remain */
if (optind < argc)
@@ -562,29 +524,29 @@ main(int argc, char **argv)
}
/* --column-inserts implies --inserts */
- if (column_inserts)
- dump_inserts = 1;
+ if (dopt->column_inserts)
+ dopt->dump_inserts = 1;
- if (dataOnly && schemaOnly)
+ if (dopt->dataOnly && dopt->schemaOnly)
{
write_msg(NULL, "options -s/--schema-only and -a/--data-only cannot be used together\n");
exit_nicely(1);
}
- if (dataOnly && outputClean)
+ if (dopt->dataOnly && dopt->outputClean)
{
write_msg(NULL, "options -c/--clean and -a/--data-only cannot be used together\n");
exit_nicely(1);
}
- if (dump_inserts && oids)
+ if (dopt->dump_inserts && dopt->oids)
{
write_msg(NULL, "options --inserts/--column-inserts and -o/--oids cannot be used together\n");
write_msg(NULL, "(The INSERT command cannot set OIDs.)\n");
exit_nicely(1);
}
- if (if_exists && !outputClean)
+ if (dopt->if_exists && !dopt->outputClean)
exit_horribly(NULL, "option --if-exists requires option -c/--clean\n");
/* Identify archive format to emit */
@@ -645,15 +607,15 @@ main(int argc, char **argv)
* Open the database using the Archiver, so it knows about it. Errors mean
* death.
*/
- ConnectDatabase(fout, dbname, pghost, pgport, username, prompt_password);
- setup_connection(fout, dumpencoding, use_role);
+ ConnectDatabase(fout, dopt->dbname, dopt->pghost, dopt->pgport, dopt->username, prompt_password);
+ setup_connection(fout, dopt, dumpencoding, use_role);
/*
* Disable security label support if server version < v9.1.x (prevents
* access to nonexistent pg_seclabel catalog)
*/
if (fout->remoteVersion < 90100)
- no_security_labels = 1;
+ dopt->no_security_labels = 1;
/*
* When running against 9.0 or later, check if we are in recovery mode,
@@ -669,7 +631,7 @@ main(int argc, char **argv)
* On hot standby slaves, never try to dump unlogged table data,
* since it will just throw an error.
*/
- no_unlogged_table_data = true;
+ dopt->no_unlogged_table_data = true;
}
PQclear(res);
}
@@ -684,7 +646,7 @@ main(int argc, char **argv)
/* check the version for the synchronized snapshots feature */
if (numWorkers > 1 && fout->remoteVersion < 90200
- && !no_synchronized_snapshots)
+ && !dopt->no_synchronized_snapshots)
exit_horribly(NULL,
"Synchronized snapshots are not supported by this server version.\n"
"Run with --no-synchronized-snapshots instead if you do not need\n"
@@ -734,27 +696,27 @@ main(int argc, char **argv)
* Dumping blobs is now default unless we saw an inclusion switch or -s
* ... but even if we did see one of these, -b turns it back on.
*/
- if (include_everything && !schemaOnly)
- outputBlobs = true;
+ if (dopt->include_everything && !dopt->schemaOnly)
+ dopt->outputBlobs = true;
/*
* Now scan the database and create DumpableObject structs for all the
* objects we intend to dump.
*/
- tblinfo = getSchemaData(fout, &numTables);
+ tblinfo = getSchemaData(fout, dopt, &numTables);
if (fout->remoteVersion < 80400)
guessConstraintInheritance(tblinfo, numTables);
- if (!schemaOnly)
+ if (!dopt->schemaOnly)
{
- getTableData(tblinfo, numTables, oids);
+ getTableData(dopt, tblinfo, numTables, dopt->oids);
buildMatViewRefreshDependencies(fout);
- if (dataOnly)
+ if (dopt->dataOnly)
getTableDataFKConstraints();
}
- if (outputBlobs)
+ if (dopt->outputBlobs)
getBlobs(fout);
/*
@@ -804,31 +766,37 @@ main(int argc, char **argv)
dumpStdStrings(fout);
/* The database item is always next, unless we don't want it at all */
- if (include_everything && !dataOnly)
- dumpDatabase(fout);
+ if (dopt->include_everything && !dopt->dataOnly)
+ dumpDatabase(fout, dopt);
/* Now the rearrangeable objects. */
for (i = 0; i < numObjs; i++)
- dumpDumpableObject(fout, dobjs[i]);
+ dumpDumpableObject(fout, dopt, dobjs[i]);
/*
* Set up options info to ensure we dump what we want.
*/
ropt = NewRestoreOptions();
ropt->filename = filename;
- ropt->dropSchema = outputClean;
- ropt->dataOnly = dataOnly;
- ropt->schemaOnly = schemaOnly;
- ropt->if_exists = if_exists;
- ropt->dumpSections = dumpSections;
- ropt->aclsSkip = aclsSkip;
- ropt->superuser = outputSuperuser;
- ropt->createDB = outputCreateDB;
- ropt->noOwner = outputNoOwner;
- ropt->noTablespace = outputNoTablespaces;
- ropt->disable_triggers = disable_triggers;
- ropt->use_setsessauth = use_setsessauth;
- ropt->enable_row_security = enable_row_security;
+ ropt->dropSchema = dopt->outputClean;
+ ropt->dataOnly = dopt->dataOnly;
+ ropt->schemaOnly = dopt->schemaOnly;
+ ropt->if_exists = dopt->if_exists;
+ ropt->column_inserts = dopt->column_inserts;
+ ropt->dumpSections = dopt->dumpSections;
+ ropt->aclsSkip = dopt->aclsSkip;
+ ropt->superuser = dopt->outputSuperuser;
+ ropt->createDB = dopt->outputCreateDB;
+ ropt->noOwner = dopt->outputNoOwner;
+ ropt->noTablespace = dopt->outputNoTablespaces;
+ ropt->disable_triggers = dopt->disable_triggers;
+ ropt->use_setsessauth = dopt->use_setsessauth;
+ ropt->disable_dollar_quoting = dopt->disable_dollar_quoting;
+ ropt->dump_inserts = dopt->dump_inserts;
+ ropt->no_security_labels = dopt->no_security_labels;
+ ropt->lockWaitTimeout = dopt->lockWaitTimeout;
+ ropt->include_everything = dopt->include_everything;
+ ropt->enable_row_security = dopt->enable_row_security;
if (compressLevel == -1)
ropt->compression = 0;
@@ -857,7 +825,7 @@ main(int argc, char **argv)
if (plainText)
RestoreArchive(fout);
- CloseArchive(fout);
+ CloseArchive(fout, dopt);
exit_nicely(0);
}
@@ -931,7 +899,7 @@ help(const char *progname)
}
static void
-setup_connection(Archive *AH, const char *dumpencoding, char *use_role)
+setup_connection(Archive *AH, DumpOptions *dopt, const char *dumpencoding, char *use_role)
{
PGconn *conn = GetConnection(AH);
const char *std_strings;
@@ -1019,7 +987,7 @@ setup_connection(Archive *AH, const char *dumpencoding, char *use_role)
ExecuteSqlStatement(AH, "BEGIN");
if (AH->remoteVersion >= 90100)
{
- if (serializable_deferrable)
+ if (dopt->serializable_deferrable)
ExecuteSqlStatement(AH,
"SET TRANSACTION ISOLATION LEVEL "
"SERIALIZABLE, READ ONLY, DEFERRABLE");
@@ -1041,7 +1009,7 @@ setup_connection(Archive *AH, const char *dumpencoding, char *use_role)
- if (AH->numWorkers > 1 && AH->remoteVersion >= 90200 && !no_synchronized_snapshots)
+ if (AH->numWorkers > 1 && AH->remoteVersion >= 90200 && !dopt->no_synchronized_snapshots)
{
if (AH->sync_snapshot_id)
{
@@ -1058,7 +1026,7 @@ setup_connection(Archive *AH, const char *dumpencoding, char *use_role)
if (AH->remoteVersion >= 90500)
{
- if (enable_row_security)
+ if (dopt->enable_row_security)
ExecuteSqlStatement(AH, "SET row_security TO ON");
else
ExecuteSqlStatement(AH, "SET row_security TO OFF");
@@ -1066,9 +1034,9 @@ setup_connection(Archive *AH, const char *dumpencoding, char *use_role)
}
static void
-setupDumpWorker(Archive *AHX, RestoreOptions *ropt)
+setupDumpWorker(Archive *AHX, DumpOptions *dopt, RestoreOptions *ropt)
{
- setup_connection(AHX, NULL, NULL);
+ setup_connection(AHX, dopt, NULL, NULL);
}
static char *
@@ -1339,12 +1307,12 @@ selectDumpableType(TypeInfo *tyinfo)
* and aclsSkip are checked separately.
*/
static void
-selectDumpableDefaultACL(DefaultACLInfo *dinfo)
+selectDumpableDefaultACL(DumpOptions *dopt, DefaultACLInfo *dinfo)
{
if (dinfo->dobj.namespace)
dinfo->dobj.dump = dinfo->dobj.namespace->dobj.dump;
else
- dinfo->dobj.dump = include_everything;
+ dinfo->dobj.dump = dopt->include_everything;
}
/*
@@ -1358,12 +1326,12 @@ selectDumpableDefaultACL(DefaultACLInfo *dinfo)
* such extensions by their having OIDs in the range reserved for initdb.
*/
static void
-selectDumpableExtension(ExtensionInfo *extinfo)
+selectDumpableExtension(DumpOptions *dopt, ExtensionInfo *extinfo)
{
- if (binary_upgrade && extinfo->dobj.catId.oid < (Oid) FirstNormalObjectId)
+ if (dopt->binary_upgrade && extinfo->dobj.catId.oid < (Oid) FirstNormalObjectId)
extinfo->dobj.dump = false;
else
- extinfo->dobj.dump = include_everything;
+ extinfo->dobj.dump = dopt->include_everything;
}
/*
@@ -1392,7 +1360,7 @@ selectDumpableObject(DumpableObject *dobj)
*/
static int
-dumpTableData_copy(Archive *fout, void *dcontext)
+dumpTableData_copy(Archive *fout, DumpOptions *dopt, void *dcontext)
{
TableDataInfo *tdinfo = (TableDataInfo *) dcontext;
TableInfo *tbinfo = tdinfo->tdtable;
@@ -1567,7 +1535,7 @@ dumpTableData_copy(Archive *fout, void *dcontext)
* E'' strings, or dollar-quoted strings. So don't emit anything like that.
*/
static int
-dumpTableData_insert(Archive *fout, void *dcontext)
+dumpTableData_insert(Archive *fout, DumpOptions *dopt, void *dcontext)
{
TableDataInfo *tdinfo = (TableDataInfo *) dcontext;
TableInfo *tbinfo = tdinfo->tdtable;
@@ -1636,7 +1604,7 @@ dumpTableData_insert(Archive *fout, void *dcontext)
else
{
/* append the list of column names if required */
- if (column_inserts)
+ if (dopt->column_inserts)
{
appendPQExpBufferStr(insertStmt, "(");
for (field = 0; field < nfields; field++)
@@ -1753,7 +1721,7 @@ dumpTableData_insert(Archive *fout, void *dcontext)
* Actually, this just makes an ArchiveEntry for the table contents.
*/
static void
-dumpTableData(Archive *fout, TableDataInfo *tdinfo)
+dumpTableData(Archive *fout, DumpOptions *dopt, TableDataInfo *tdinfo)
{
TableInfo *tbinfo = tdinfo->tdtable;
PQExpBuffer copyBuf = createPQExpBuffer();
@@ -1761,7 +1729,7 @@ dumpTableData(Archive *fout, TableDataInfo *tdinfo)
DataDumperPtr dumpFn;
char *copyStmt;
- if (!dump_inserts)
+ if (!dopt->dump_inserts)
{
/* Dump/restore using COPY */
dumpFn = dumpTableData_copy;
@@ -1845,14 +1813,14 @@ refreshMatViewData(Archive *fout, TableDataInfo *tdinfo)
* set up dumpable objects representing the contents of tables
*/
static void
-getTableData(TableInfo *tblinfo, int numTables, bool oids)
+getTableData(DumpOptions *dopt, TableInfo *tblinfo, int numTables, bool oids)
{
int i;
for (i = 0; i < numTables; i++)
{
if (tblinfo[i].dobj.dump)
- makeTableDataInfo(&(tblinfo[i]), oids);
+ makeTableDataInfo(dopt, &(tblinfo[i]), oids);
}
}
@@ -1863,7 +1831,7 @@ getTableData(TableInfo *tblinfo, int numTables, bool oids)
* table data; the "dump" flag in such objects isn't used.
*/
static void
-makeTableDataInfo(TableInfo *tbinfo, bool oids)
+makeTableDataInfo(DumpOptions *dopt, TableInfo *tbinfo, bool oids)
{
TableDataInfo *tdinfo;
@@ -1883,7 +1851,7 @@ makeTableDataInfo(TableInfo *tbinfo, bool oids)
/* Don't dump data in unlogged tables, if so requested */
if (tbinfo->relpersistence == RELPERSISTENCE_UNLOGGED &&
- no_unlogged_table_data)
+ dopt->no_unlogged_table_data)
return;
/* Check that the data is not explicitly excluded */
@@ -2156,7 +2124,7 @@ guessConstraintInheritance(TableInfo *tblinfo, int numTables)
* dump the database definition
*/
static void
-dumpDatabase(Archive *fout)
+dumpDatabase(Archive *fout, DumpOptions *dopt)
{
PQExpBuffer dbQry = createPQExpBuffer();
PQExpBuffer delQry = createPQExpBuffer();
@@ -2318,7 +2286,7 @@ dumpDatabase(Archive *fout)
fmtId(tablespace));
appendPQExpBufferStr(creaQry, ";\n");
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
{
appendPQExpBufferStr(creaQry, "\n-- For binary upgrade, set datfrozenxid and datminmxid.\n");
appendPQExpBuffer(creaQry, "UPDATE pg_catalog.pg_database\n"
@@ -2357,7 +2325,7 @@ dumpDatabase(Archive *fout)
* pg_largeobject and pg_largeobject_metadata come from the old system
* intact, so set their relfrozenxids and relminmxids.
*/
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
{
PGresult *lo_res;
PQExpBuffer loFrozenQry = createPQExpBuffer();
@@ -2475,14 +2443,14 @@ dumpDatabase(Archive *fout)
{
resetPQExpBuffer(dbQry);
appendPQExpBuffer(dbQry, "DATABASE %s", fmtId(datname));
- dumpComment(fout, dbQry->data, NULL, "",
+ dumpComment(fout, dopt, dbQry->data, NULL, "",
dbCatId, 0, dbDumpId);
}
PQclear(res);
/* Dump shared security label. */
- if (!no_security_labels && fout->remoteVersion >= 90200)
+ if (!dopt->no_security_labels && fout->remoteVersion >= 90200)
{
PQExpBuffer seclabelQry = createPQExpBuffer();
@@ -2503,7 +2471,6 @@ dumpDatabase(Archive *fout)
destroyPQExpBuffer(creaQry);
}
-
/*
* dumpEncoding: put the correct encoding into the archive
*/
@@ -2643,7 +2610,7 @@ getBlobs(Archive *fout)
* dump the definition (metadata) of the given large object
*/
static void
-dumpBlob(Archive *fout, BlobInfo *binfo)
+dumpBlob(Archive *fout, DumpOptions *dopt, BlobInfo *binfo)
{
PQExpBuffer cquery = createPQExpBuffer();
PQExpBuffer dquery = createPQExpBuffer();
@@ -2670,18 +2637,18 @@ dumpBlob(Archive *fout, BlobInfo *binfo)
appendPQExpBuffer(cquery, "LARGE OBJECT %s", binfo->dobj.name);
/* Dump comment if any */
- dumpComment(fout, cquery->data,
+ dumpComment(fout, dopt, cquery->data,
NULL, binfo->rolname,
binfo->dobj.catId, 0, binfo->dobj.dumpId);
/* Dump security label if any */
- dumpSecLabel(fout, cquery->data,
+ dumpSecLabel(fout, dopt, cquery->data,
NULL, binfo->rolname,
binfo->dobj.catId, 0, binfo->dobj.dumpId);
/* Dump ACL if any */
if (binfo->blobacl)
- dumpACL(fout, binfo->dobj.catId, binfo->dobj.dumpId, "LARGE OBJECT",
+ dumpACL(fout, dopt, binfo->dobj.catId, binfo->dobj.dumpId, "LARGE OBJECT",
binfo->dobj.name, NULL, cquery->data,
NULL, binfo->rolname, binfo->blobacl);
@@ -2694,7 +2661,7 @@ dumpBlob(Archive *fout, BlobInfo *binfo)
* dump the data contents of all large objects
*/
static int
-dumpBlobs(Archive *fout, void *arg)
+dumpBlobs(Archive *fout, DumpOptions *dopt, void *arg)
{
const char *blobQry;
const char *blobFetchQry;
@@ -2922,14 +2889,14 @@ getRowSecurity(Archive *fout, TableInfo tblinfo[], int numTables)
* dump the definition of the given row-security policy
*/
static void
-dumpRowSecurity(Archive *fout, RowSecurityInfo *rsinfo)
+dumpRowSecurity(Archive *fout, DumpOptions *dopt, RowSecurityInfo *rsinfo)
{
TableInfo *tbinfo = rsinfo->rstable;
PQExpBuffer query;
PQExpBuffer delqry;
const char *cmd;
- if (dataOnly)
+ if (dopt->dataOnly)
return;
/*
@@ -3343,7 +3310,7 @@ findNamespace(Archive *fout, Oid nsoid, Oid objoid)
* numExtensions is set to the number of extensions read in
*/
ExtensionInfo *
-getExtensions(Archive *fout, int *numExtensions)
+getExtensions(Archive *fout, DumpOptions *dopt, int *numExtensions)
{
PGresult *res;
int ntups;
@@ -3407,7 +3374,7 @@ getExtensions(Archive *fout, int *numExtensions)
extinfo[i].extcondition = pg_strdup(PQgetvalue(res, i, i_extcondition));
/* Decide whether we want to dump it */
- selectDumpableExtension(&(extinfo[i]));
+ selectDumpableExtension(dopt, &(extinfo[i]));
}
PQclear(res);
@@ -4158,7 +4125,7 @@ getOpfamilies(Archive *fout, int *numOpfamilies)
* numAggs is set to the number of aggregates read in
*/
AggInfo *
-getAggregates(Archive *fout, int *numAggs)
+getAggregates(Archive *fout, DumpOptions *dopt, int *numAggs)
{
PGresult *res;
int ntups;
@@ -4197,7 +4164,7 @@ getAggregates(Archive *fout, int *numAggs)
"(SELECT oid FROM pg_namespace "
"WHERE nspname = 'pg_catalog')",
username_subquery);
- if (binary_upgrade && fout->remoteVersion >= 90100)
+ if (dopt->binary_upgrade && fout->remoteVersion >= 90100)
appendPQExpBufferStr(query,
" OR EXISTS(SELECT 1 FROM pg_depend WHERE "
"classid = 'pg_proc'::regclass AND "
@@ -4337,7 +4304,7 @@ getAggregates(Archive *fout, int *numAggs)
* numFuncs is set to the number of functions read in
*/
FuncInfo *
-getFuncs(Archive *fout, int *numFuncs)
+getFuncs(Archive *fout, DumpOptions *dopt, int *numFuncs)
{
PGresult *res;
int ntups;
@@ -4394,7 +4361,7 @@ getFuncs(Archive *fout, int *numFuncs)
"\n AND NOT EXISTS (SELECT 1 FROM pg_depend "
"WHERE classid = 'pg_proc'::regclass AND "
"objid = p.oid AND deptype = 'i')");
- if (binary_upgrade && fout->remoteVersion >= 90100)
+ if (dopt->binary_upgrade && fout->remoteVersion >= 90100)
appendPQExpBufferStr(query,
"\n OR EXISTS(SELECT 1 FROM pg_depend WHERE "
"classid = 'pg_proc'::regclass AND "
@@ -4520,7 +4487,7 @@ getFuncs(Archive *fout, int *numFuncs)
* numTables is set to the number of tables read in
*/
TableInfo *
-getTables(Archive *fout, int *numTables)
+getTables(Archive *fout, DumpOptions *dopt, int *numTables)
{
PGresult *res;
int ntups;
@@ -5071,7 +5038,7 @@ getTables(Archive *fout, int *numTables)
i_toastreloptions = PQfnumber(res, "toast_reloptions");
i_reloftype = PQfnumber(res, "reloftype");
- if (lockWaitTimeout && fout->remoteVersion >= 70300)
+ if (dopt->lockWaitTimeout && fout->remoteVersion >= 70300)
{
/*
* Arrange to fail instead of waiting forever for a table lock.
@@ -5082,7 +5049,7 @@ getTables(Archive *fout, int *numTables)
*/
resetPQExpBuffer(query);
appendPQExpBufferStr(query, "SET statement_timeout = ");
- appendStringLiteralConn(query, lockWaitTimeout, GetConnection(fout));
+ appendStringLiteralConn(query, dopt->lockWaitTimeout, GetConnection(fout));
ExecuteSqlStatement(fout, query->data);
}
@@ -5178,7 +5145,7 @@ getTables(Archive *fout, int *numTables)
tblinfo[i].dobj.name);
}
- if (lockWaitTimeout && fout->remoteVersion >= 70300)
+ if (dopt->lockWaitTimeout && fout->remoteVersion >= 70300)
{
ExecuteSqlStatement(fout, "SET statement_timeout = 0");
}
@@ -6593,7 +6560,7 @@ getCasts(Archive *fout, int *numCasts)
* modifies tblinfo
*/
void
-getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
+getTableAttrs(Archive *fout, DumpOptions *dopt, TableInfo *tblinfo, int numTables)
{
int i,
j;
@@ -6948,7 +6915,7 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
addObjectDependency(&attrdefs[j].dobj,
tbinfo->dobj.dumpId);
}
- else if (!shouldPrintColumn(tbinfo, adnum - 1))
+ else if (!shouldPrintColumn(dopt, tbinfo, adnum - 1))
{
/* column will be suppressed, print default separately */
attrdefs[j].separate = true;
@@ -7161,9 +7128,9 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
* must be kept in sync with this decision.
*/
bool
-shouldPrintColumn(TableInfo *tbinfo, int colno)
+shouldPrintColumn(DumpOptions *dopt, TableInfo *tbinfo, int colno)
{
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
return true;
return (tbinfo->attislocal[colno] && !tbinfo->attisdropped[colno]);
}
@@ -7709,7 +7676,7 @@ getForeignServers(Archive *fout, int *numForeignServers)
* numDefaultACLs is set to the number of ACLs read in
*/
DefaultACLInfo *
-getDefaultACLs(Archive *fout, int *numDefaultACLs)
+getDefaultACLs(Archive *fout, DumpOptions *dopt, int *numDefaultACLs)
{
DefaultACLInfo *daclinfo;
PQExpBuffer query;
@@ -7778,7 +7745,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
daclinfo[i].defaclacl = pg_strdup(PQgetvalue(res, i, i_defaclacl));
/* Decide whether we want to dump it */
- selectDumpableDefaultACL(&(daclinfo[i]));
+ selectDumpableDefaultACL(dopt, &(daclinfo[i]));
}
PQclear(res);
@@ -7807,7 +7774,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
* calling ArchiveEntry() for the specified object.
*/
static void
-dumpComment(Archive *fout, const char *target,
+dumpComment(Archive *fout, DumpOptions *dopt, const char *target,
const char *namespace, const char *owner,
CatalogId catalogId, int subid, DumpId dumpId)
{
@@ -7817,12 +7784,12 @@ dumpComment(Archive *fout, const char *target,
/* Comments are schema not data ... except blob comments are data */
if (strncmp(target, "LARGE OBJECT ", 13) != 0)
{
- if (dataOnly)
+ if (dopt->dataOnly)
return;
}
else
{
- if (schemaOnly)
+ if (dopt->schemaOnly)
return;
}
@@ -7871,7 +7838,7 @@ dumpComment(Archive *fout, const char *target,
* and its columns.
*/
static void
-dumpTableComment(Archive *fout, TableInfo *tbinfo,
+dumpTableComment(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo,
const char *reltypename)
{
CommentItem *comments;
@@ -7880,7 +7847,7 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
PQExpBuffer target;
/* Comments are SCHEMA not data */
- if (dataOnly)
+ if (dopt->dataOnly)
return;
/* Search for comments associated with relation, using table */
@@ -8125,108 +8092,108 @@ collectComments(Archive *fout, CommentItem **items)
* ArchiveEntries (TOC objects) for each object to be dumped.
*/
static void
-dumpDumpableObject(Archive *fout, DumpableObject *dobj)
+dumpDumpableObject(Archive *fout, DumpOptions *dopt, DumpableObject *dobj)
{
switch (dobj->objType)
{
case DO_NAMESPACE:
- dumpNamespace(fout, (NamespaceInfo *) dobj);
+ dumpNamespace(fout, dopt, (NamespaceInfo *) dobj);
break;
case DO_EXTENSION:
- dumpExtension(fout, (ExtensionInfo *) dobj);
+ dumpExtension(fout, dopt, (ExtensionInfo *) dobj);
break;
case DO_TYPE:
- dumpType(fout, (TypeInfo *) dobj);
+ dumpType(fout, dopt, (TypeInfo *) dobj);
break;
case DO_SHELL_TYPE:
- dumpShellType(fout, (ShellTypeInfo *) dobj);
+ dumpShellType(fout, dopt, (ShellTypeInfo *) dobj);
break;
case DO_FUNC:
- dumpFunc(fout, (FuncInfo *) dobj);
+ dumpFunc(fout, dopt, (FuncInfo *) dobj);
break;
case DO_AGG:
- dumpAgg(fout, (AggInfo *) dobj);
+ dumpAgg(fout, dopt, (AggInfo *) dobj);
break;
case DO_OPERATOR:
- dumpOpr(fout, (OprInfo *) dobj);
+ dumpOpr(fout, dopt, (OprInfo *) dobj);
break;
case DO_OPCLASS:
- dumpOpclass(fout, (OpclassInfo *) dobj);
+ dumpOpclass(fout, dopt, (OpclassInfo *) dobj);
break;
case DO_OPFAMILY:
- dumpOpfamily(fout, (OpfamilyInfo *) dobj);
+ dumpOpfamily(fout, dopt, (OpfamilyInfo *) dobj);
break;
case DO_COLLATION:
- dumpCollation(fout, (CollInfo *) dobj);
+ dumpCollation(fout, dopt, (CollInfo *) dobj);
break;
case DO_CONVERSION:
- dumpConversion(fout, (ConvInfo *) dobj);
+ dumpConversion(fout, dopt, (ConvInfo *) dobj);
break;
case DO_TABLE:
- dumpTable(fout, (TableInfo *) dobj);
+ dumpTable(fout, dopt, (TableInfo *) dobj);
break;
case DO_ATTRDEF:
- dumpAttrDef(fout, (AttrDefInfo *) dobj);
+ dumpAttrDef(fout, dopt, (AttrDefInfo *) dobj);
break;
case DO_INDEX:
- dumpIndex(fout, (IndxInfo *) dobj);
+ dumpIndex(fout, dopt, (IndxInfo *) dobj);
break;
case DO_REFRESH_MATVIEW:
refreshMatViewData(fout, (TableDataInfo *) dobj);
break;
case DO_RULE:
- dumpRule(fout, (RuleInfo *) dobj);
+ dumpRule(fout, dopt, (RuleInfo *) dobj);
break;
case DO_TRIGGER:
- dumpTrigger(fout, (TriggerInfo *) dobj);
+ dumpTrigger(fout, dopt, (TriggerInfo *) dobj);
break;
case DO_EVENT_TRIGGER:
- dumpEventTrigger(fout, (EventTriggerInfo *) dobj);
+ dumpEventTrigger(fout, dopt, (EventTriggerInfo *) dobj);
break;
case DO_CONSTRAINT:
- dumpConstraint(fout, (ConstraintInfo *) dobj);
+ dumpConstraint(fout, dopt, (ConstraintInfo *) dobj);
break;
case DO_FK_CONSTRAINT:
- dumpConstraint(fout, (ConstraintInfo *) dobj);
+ dumpConstraint(fout, dopt, (ConstraintInfo *) dobj);
break;
case DO_PROCLANG:
- dumpProcLang(fout, (ProcLangInfo *) dobj);
+ dumpProcLang(fout, dopt, (ProcLangInfo *) dobj);
break;
case DO_CAST:
- dumpCast(fout, (CastInfo *) dobj);
+ dumpCast(fout, dopt, (CastInfo *) dobj);
break;
case DO_TABLE_DATA:
if (((TableDataInfo *) dobj)->tdtable->relkind == RELKIND_SEQUENCE)
dumpSequenceData(fout, (TableDataInfo *) dobj);
else
- dumpTableData(fout, (TableDataInfo *) dobj);
+ dumpTableData(fout, dopt, (TableDataInfo *) dobj);
break;
case DO_DUMMY_TYPE:
/* table rowtypes and array types are never dumped separately */
break;
case DO_TSPARSER:
- dumpTSParser(fout, (TSParserInfo *) dobj);
+ dumpTSParser(fout, dopt, (TSParserInfo *) dobj);
break;
case DO_TSDICT:
- dumpTSDictionary(fout, (TSDictInfo *) dobj);
+ dumpTSDictionary(fout, dopt, (TSDictInfo *) dobj);
break;
case DO_TSTEMPLATE:
- dumpTSTemplate(fout, (TSTemplateInfo *) dobj);
+ dumpTSTemplate(fout, dopt, (TSTemplateInfo *) dobj);
break;
case DO_TSCONFIG:
- dumpTSConfig(fout, (TSConfigInfo *) dobj);
+ dumpTSConfig(fout, dopt, (TSConfigInfo *) dobj);
break;
case DO_FDW:
- dumpForeignDataWrapper(fout, (FdwInfo *) dobj);
+ dumpForeignDataWrapper(fout, dopt, (FdwInfo *) dobj);
break;
case DO_FOREIGN_SERVER:
- dumpForeignServer(fout, (ForeignServerInfo *) dobj);
+ dumpForeignServer(fout, dopt, (ForeignServerInfo *) dobj);
break;
case DO_DEFAULT_ACL:
- dumpDefaultACL(fout, (DefaultACLInfo *) dobj);
+ dumpDefaultACL(fout, dopt, (DefaultACLInfo *) dobj);
break;
case DO_BLOB:
- dumpBlob(fout, (BlobInfo *) dobj);
+ dumpBlob(fout, dopt, (BlobInfo *) dobj);
break;
case DO_BLOB_DATA:
ArchiveEntry(fout, dobj->catId, dobj->dumpId,
@@ -8237,7 +8204,7 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj)
dumpBlobs, NULL);
break;
case DO_ROW_SECURITY:
- dumpRowSecurity(fout, (RowSecurityInfo *) dobj);
+ dumpRowSecurity(fout, dopt, (RowSecurityInfo *) dobj);
break;
case DO_PRE_DATA_BOUNDARY:
case DO_POST_DATA_BOUNDARY:
@@ -8251,7 +8218,7 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj)
* writes out to fout the queries to recreate a user-defined namespace
*/
static void
-dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
+dumpNamespace(Archive *fout, DumpOptions *dopt, NamespaceInfo *nspinfo)
{
PQExpBuffer q;
PQExpBuffer delq;
@@ -8259,7 +8226,7 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
char *qnspname;
/* Skip if not to be dumped */
- if (!nspinfo->dobj.dump || dataOnly)
+ if (!nspinfo->dobj.dump || dopt->dataOnly)
return;
/* don't dump dummy namespace from pre-7.3 source */
@@ -8278,7 +8245,7 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
appendPQExpBuffer(labelq, "SCHEMA %s", qnspname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &nspinfo->dobj, labelq->data);
ArchiveEntry(fout, nspinfo->dobj.catId, nspinfo->dobj.dumpId,
@@ -8291,14 +8258,14 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
NULL, NULL);
/* Dump Schema Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, nspinfo->rolname,
nspinfo->dobj.catId, 0, nspinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
NULL, nspinfo->rolname,
nspinfo->dobj.catId, 0, nspinfo->dobj.dumpId);
- dumpACL(fout, nspinfo->dobj.catId, nspinfo->dobj.dumpId, "SCHEMA",
+ dumpACL(fout, dopt, nspinfo->dobj.catId, nspinfo->dobj.dumpId, "SCHEMA",
qnspname, NULL, nspinfo->dobj.name, NULL,
nspinfo->rolname, nspinfo->nspacl);
@@ -8314,7 +8281,7 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
* writes out to fout the queries to recreate an extension
*/
static void
-dumpExtension(Archive *fout, ExtensionInfo *extinfo)
+dumpExtension(Archive *fout, DumpOptions *dopt, ExtensionInfo *extinfo)
{
PQExpBuffer q;
PQExpBuffer delq;
@@ -8322,7 +8289,7 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
char *qextname;
/* Skip if not to be dumped */
- if (!extinfo->dobj.dump || dataOnly)
+ if (!extinfo->dobj.dump || dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -8333,7 +8300,7 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
appendPQExpBuffer(delq, "DROP EXTENSION %s;\n", qextname);
- if (!binary_upgrade)
+ if (!dopt->binary_upgrade)
{
/*
* In a regular dump, we use IF NOT EXISTS so that there isn't a
@@ -8419,10 +8386,10 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
NULL, NULL);
/* Dump Extension Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, "",
extinfo->dobj.catId, 0, extinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
NULL, "",
extinfo->dobj.catId, 0, extinfo->dobj.dumpId);
@@ -8438,23 +8405,23 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
* writes out to fout the queries to recreate a user-defined type
*/
static void
-dumpType(Archive *fout, TypeInfo *tyinfo)
+dumpType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo)
{
/* Skip if not to be dumped */
- if (!tyinfo->dobj.dump || dataOnly)
+ if (!tyinfo->dobj.dump || dopt->dataOnly)
return;
/* Dump out in proper style */
if (tyinfo->typtype == TYPTYPE_BASE)
- dumpBaseType(fout, tyinfo);
+ dumpBaseType(fout, dopt, tyinfo);
else if (tyinfo->typtype == TYPTYPE_DOMAIN)
- dumpDomain(fout, tyinfo);
+ dumpDomain(fout, dopt, tyinfo);
else if (tyinfo->typtype == TYPTYPE_COMPOSITE)
- dumpCompositeType(fout, tyinfo);
+ dumpCompositeType(fout, dopt, tyinfo);
else if (tyinfo->typtype == TYPTYPE_ENUM)
- dumpEnumType(fout, tyinfo);
+ dumpEnumType(fout, dopt, tyinfo);
else if (tyinfo->typtype == TYPTYPE_RANGE)
- dumpRangeType(fout, tyinfo);
+ dumpRangeType(fout, dopt, tyinfo);
else
write_msg(NULL, "WARNING: typtype of data type \"%s\" appears to be invalid\n",
tyinfo->dobj.name);
@@ -8465,7 +8432,7 @@ dumpType(Archive *fout, TypeInfo *tyinfo)
* writes out to fout the queries to recreate a user-defined enum type
*/
static void
-dumpEnumType(Archive *fout, TypeInfo *tyinfo)
+dumpEnumType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo)
{
PQExpBuffer q = createPQExpBuffer();
PQExpBuffer delq = createPQExpBuffer();
@@ -8510,14 +8477,14 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(delq, "%s;\n",
qtypname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_type_oids_by_type_oid(fout, q,
tyinfo->dobj.catId.oid);
appendPQExpBuffer(q, "CREATE TYPE %s AS ENUM (",
qtypname);
- if (!binary_upgrade)
+ if (!dopt->binary_upgrade)
{
/* Labels with server-assigned oids */
for (i = 0; i < num; i++)
@@ -8532,7 +8499,7 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBufferStr(q, "\n);\n");
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
{
/* Labels with dump-assigned (preserved) oids */
for (i = 0; i < num; i++)
@@ -8556,7 +8523,7 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(labelq, "TYPE %s", qtypname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -8570,14 +8537,14 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
NULL, NULL);
/* Dump Type Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
+ dumpACL(fout, dopt, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
qtypname, NULL, tyinfo->dobj.name,
tyinfo->dobj.namespace->dobj.name,
tyinfo->rolname, tyinfo->typacl);
@@ -8594,7 +8561,7 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
* writes out to fout the queries to recreate a user-defined range type
*/
static void
-dumpRangeType(Archive *fout, TypeInfo *tyinfo)
+dumpRangeType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo)
{
PQExpBuffer q = createPQExpBuffer();
PQExpBuffer delq = createPQExpBuffer();
@@ -8640,7 +8607,7 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(delq, "%s;\n",
qtypname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_type_oids_by_type_oid(fout,
q, tyinfo->dobj.catId.oid);
@@ -8688,7 +8655,7 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(labelq, "TYPE %s", qtypname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -8702,14 +8669,14 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
NULL, NULL);
/* Dump Type Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
+ dumpACL(fout, dopt, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
qtypname, NULL, tyinfo->dobj.name,
tyinfo->dobj.namespace->dobj.name,
tyinfo->rolname, tyinfo->typacl);
@@ -8726,7 +8693,7 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
* writes out to fout the queries to recreate a user-defined base type
*/
static void
-dumpBaseType(Archive *fout, TypeInfo *tyinfo)
+dumpBaseType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo)
{
PQExpBuffer q = createPQExpBuffer();
PQExpBuffer delq = createPQExpBuffer();
@@ -8980,7 +8947,7 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
qtypname);
/* We might already have a shell type, but setting pg_type_oid is harmless */
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_type_oids_by_type_oid(fout, q,
tyinfo->dobj.catId.oid);
@@ -9078,7 +9045,7 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(labelq, "TYPE %s", qtypname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -9092,14 +9059,14 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
NULL, NULL);
/* Dump Type Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
+ dumpACL(fout, dopt, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
qtypname, NULL, tyinfo->dobj.name,
tyinfo->dobj.namespace->dobj.name,
tyinfo->rolname, tyinfo->typacl);
@@ -9116,7 +9083,7 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
* writes out to fout the queries to recreate a user-defined domain
*/
static void
-dumpDomain(Archive *fout, TypeInfo *tyinfo)
+dumpDomain(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo)
{
PQExpBuffer q = createPQExpBuffer();
PQExpBuffer delq = createPQExpBuffer();
@@ -9176,7 +9143,7 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
typdefault = NULL;
typcollation = atooid(PQgetvalue(res, 0, PQfnumber(res, "typcollation")));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_type_oids_by_type_oid(fout, q,
tyinfo->dobj.catId.oid);
@@ -9240,7 +9207,7 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(labelq, "DOMAIN %s", qtypname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -9254,14 +9221,14 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
NULL, NULL);
/* Dump Domain Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
+ dumpACL(fout, dopt, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
qtypname, NULL, tyinfo->dobj.name,
tyinfo->dobj.namespace->dobj.name,
tyinfo->rolname, tyinfo->typacl);
@@ -9278,7 +9245,7 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
* composite type
*/
static void
-dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
+dumpCompositeType(Archive *fout, DumpOptions *dopt, TypeInfo *tyinfo)
{
PQExpBuffer q = createPQExpBuffer();
PQExpBuffer dropped = createPQExpBuffer();
@@ -9355,7 +9322,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
i_attcollation = PQfnumber(res, "attcollation");
i_typrelid = PQfnumber(res, "typrelid");
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
{
Oid typrelid = atooid(PQgetvalue(res, 0, i_typrelid));
@@ -9386,7 +9353,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
attisdropped = (PQgetvalue(res, i, i_attisdropped)[0] == 't');
attcollation = atooid(PQgetvalue(res, i, i_attcollation));
- if (attisdropped && !binary_upgrade)
+ if (attisdropped && !dopt->binary_upgrade)
continue;
/* Format properly if not first attr */
@@ -9454,7 +9421,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(labelq, "TYPE %s", qtypname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -9469,14 +9436,14 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
/* Dump Type Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
- dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
+ dumpACL(fout, dopt, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
qtypname, NULL, tyinfo->dobj.name,
tyinfo->dobj.namespace->dobj.name,
tyinfo->rolname, tyinfo->typacl);
@@ -9607,12 +9574,12 @@ dumpCompositeTypeColComments(Archive *fout, TypeInfo *tyinfo)
* We dump a shell definition in advance of the I/O functions for the type.
*/
static void
-dumpShellType(Archive *fout, ShellTypeInfo *stinfo)
+dumpShellType(Archive *fout, DumpOptions *dopt, ShellTypeInfo *stinfo)
{
PQExpBuffer q;
/* Skip if not to be dumped */
- if (!stinfo->dobj.dump || dataOnly)
+ if (!stinfo->dobj.dump || dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -9626,7 +9593,7 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo)
* after it's filled in, otherwise the backend complains.
*/
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_type_oids_by_type_oid(fout, q,
stinfo->baseType->dobj.catId.oid);
@@ -9662,12 +9629,12 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo)
* That case isn't checked here either.
*/
static bool
-shouldDumpProcLangs(void)
+shouldDumpProcLangs(DumpOptions *dopt)
{
- if (!include_everything)
+ if (!dopt->include_everything)
return false;
/* And they're schema not data */
- if (dataOnly)
+ if (dopt->dataOnly)
return false;
return true;
}
@@ -9678,7 +9645,7 @@ shouldDumpProcLangs(void)
* procedural language
*/
static void
-dumpProcLang(Archive *fout, ProcLangInfo *plang)
+dumpProcLang(Archive *fout, DumpOptions *dopt, ProcLangInfo *plang)
{
PQExpBuffer defqry;
PQExpBuffer delqry;
@@ -9691,7 +9658,7 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
FuncInfo *validatorInfo = NULL;
/* Skip if not to be dumped */
- if (!plang->dobj.dump || dataOnly)
+ if (!plang->dobj.dump || dopt->dataOnly)
return;
/*
@@ -9737,7 +9704,7 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
if (!plang->dobj.ext_member)
{
- if (!useParams && !shouldDumpProcLangs())
+ if (!useParams && !shouldDumpProcLangs(dopt))
return;
}
@@ -9804,7 +9771,7 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
appendPQExpBuffer(labelq, "LANGUAGE %s", qlanname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(defqry, &plang->dobj, labelq->data);
ArchiveEntry(fout, plang->dobj.catId, plang->dobj.dumpId,
@@ -9816,15 +9783,15 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
NULL, NULL);
/* Dump Proc Lang Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, "",
plang->dobj.catId, 0, plang->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
NULL, "",
plang->dobj.catId, 0, plang->dobj.dumpId);
if (plang->lanpltrusted)
- dumpACL(fout, plang->dobj.catId, plang->dobj.dumpId, "LANGUAGE",
+ dumpACL(fout, dopt, plang->dobj.catId, plang->dobj.dumpId, "LANGUAGE",
qlanname, NULL, plang->dobj.name,
lanschema,
plang->lanowner, plang->lanacl);
@@ -9971,7 +9938,7 @@ format_function_signature(Archive *fout, FuncInfo *finfo, bool honor_quotes)
* dump out one function
*/
static void
-dumpFunc(Archive *fout, FuncInfo *finfo)
+dumpFunc(Archive *fout, DumpOptions *dopt, FuncInfo *finfo)
{
PQExpBuffer query;
PQExpBuffer q;
@@ -10010,7 +9977,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
int i;
/* Skip if not to be dumped */
- if (!finfo->dobj.dump || dataOnly)
+ if (!finfo->dobj.dump || dopt->dataOnly)
return;
query = createPQExpBuffer();
@@ -10203,7 +10170,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
* where we have bin, use dollar quoting if allowed and src
* contains quote or backslash; else use regular quoting.
*/
- if (disable_dollar_quoting ||
+ if (dopt->disable_dollar_quoting ||
(strchr(prosrc, '\'') == NULL && strchr(prosrc, '\\') == NULL))
appendStringLiteralAH(asPart, prosrc, fout);
else
@@ -10216,7 +10183,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
{
appendPQExpBufferStr(asPart, "AS ");
/* with no bin, dollar quote src unconditionally if allowed */
- if (disable_dollar_quoting)
+ if (dopt->disable_dollar_quoting)
appendStringLiteralAH(asPart, prosrc, fout);
else
appendStringLiteralDQ(asPart, prosrc, NULL);
@@ -10392,7 +10359,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
appendPQExpBuffer(labelq, "FUNCTION %s", funcsig);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &finfo->dobj, labelq->data);
ArchiveEntry(fout, finfo->dobj.catId, finfo->dobj.dumpId,
@@ -10406,14 +10373,14 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
NULL, NULL);
/* Dump Function Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
finfo->dobj.namespace->dobj.name, finfo->rolname,
finfo->dobj.catId, 0, finfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
finfo->dobj.namespace->dobj.name, finfo->rolname,
finfo->dobj.catId, 0, finfo->dobj.dumpId);
- dumpACL(fout, finfo->dobj.catId, finfo->dobj.dumpId, "FUNCTION",
+ dumpACL(fout, dopt, finfo->dobj.catId, finfo->dobj.dumpId, "FUNCTION",
funcsig, NULL, funcsig_tag,
finfo->dobj.namespace->dobj.name,
finfo->rolname, finfo->proacl);
@@ -10444,7 +10411,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
* Dump a user-defined cast
*/
static void
-dumpCast(Archive *fout, CastInfo *cast)
+dumpCast(Archive *fout, DumpOptions *dopt, CastInfo *cast)
{
PQExpBuffer defqry;
PQExpBuffer delqry;
@@ -10452,7 +10419,7 @@ dumpCast(Archive *fout, CastInfo *cast)
FuncInfo *funcInfo = NULL;
/* Skip if not to be dumped */
- if (!cast->dobj.dump || dataOnly)
+ if (!cast->dobj.dump || dopt->dataOnly)
return;
/* Cannot dump if we don't have the cast function's info */
@@ -10566,7 +10533,7 @@ dumpCast(Archive *fout, CastInfo *cast)
getFormattedTypeName(fout, cast->castsource, zeroAsNone),
getFormattedTypeName(fout, cast->casttarget, zeroAsNone));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(defqry, &cast->dobj, labelq->data);
ArchiveEntry(fout, cast->dobj.catId, cast->dobj.dumpId,
@@ -10578,7 +10545,7 @@ dumpCast(Archive *fout, CastInfo *cast)
NULL, NULL);
/* Dump Cast Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, "",
cast->dobj.catId, 0, cast->dobj.dumpId);
@@ -10592,7 +10559,7 @@ dumpCast(Archive *fout, CastInfo *cast)
* write out a single operator definition
*/
static void
-dumpOpr(Archive *fout, OprInfo *oprinfo)
+dumpOpr(Archive *fout, DumpOptions *dopt, OprInfo *oprinfo)
{
PQExpBuffer query;
PQExpBuffer q;
@@ -10626,7 +10593,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
char *oprref;
/* Skip if not to be dumped */
- if (!oprinfo->dobj.dump || dataOnly)
+ if (!oprinfo->dobj.dump || dopt->dataOnly)
return;
/*
@@ -10816,7 +10783,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
appendPQExpBuffer(labelq, "OPERATOR %s", oprid->data);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &oprinfo->dobj, labelq->data);
ArchiveEntry(fout, oprinfo->dobj.catId, oprinfo->dobj.dumpId,
@@ -10830,7 +10797,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
NULL, NULL);
/* Dump Operator Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
oprinfo->dobj.namespace->dobj.name, oprinfo->rolname,
oprinfo->dobj.catId, 0, oprinfo->dobj.dumpId);
@@ -10980,7 +10947,7 @@ convertTSFunction(Archive *fout, Oid funcOid)
* write out a single operator class definition
*/
static void
-dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
+dumpOpclass(Archive *fout, DumpOptions *dopt, OpclassInfo *opcinfo)
{
PQExpBuffer query;
PQExpBuffer q;
@@ -11024,7 +10991,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
int i;
/* Skip if not to be dumped */
- if (!opcinfo->dobj.dump || dataOnly)
+ if (!opcinfo->dobj.dump || dopt->dataOnly)
return;
/*
@@ -11324,7 +11291,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
appendPQExpBuffer(labelq, " USING %s",
fmtId(amname));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &opcinfo->dobj, labelq->data);
ArchiveEntry(fout, opcinfo->dobj.catId, opcinfo->dobj.dumpId,
@@ -11338,7 +11305,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
NULL, NULL);
/* Dump Operator Class Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, opcinfo->rolname,
opcinfo->dobj.catId, 0, opcinfo->dobj.dumpId);
@@ -11357,7 +11324,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
* specific opclass within the opfamily.
*/
static void
-dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
+dumpOpfamily(Archive *fout, DumpOptions *dopt, OpfamilyInfo *opfinfo)
{
PQExpBuffer query;
PQExpBuffer q;
@@ -11391,7 +11358,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
int i;
/* Skip if not to be dumped */
- if (!opfinfo->dobj.dump || dataOnly)
+ if (!opfinfo->dobj.dump || dopt->dataOnly)
return;
/*
@@ -11637,7 +11604,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
appendPQExpBuffer(labelq, " USING %s",
fmtId(amname));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &opfinfo->dobj, labelq->data);
ArchiveEntry(fout, opfinfo->dobj.catId, opfinfo->dobj.dumpId,
@@ -11651,7 +11618,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
NULL, NULL);
/* Dump Operator Family Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, opfinfo->rolname,
opfinfo->dobj.catId, 0, opfinfo->dobj.dumpId);
@@ -11669,7 +11636,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
* write out a single collation definition
*/
static void
-dumpCollation(Archive *fout, CollInfo *collinfo)
+dumpCollation(Archive *fout, DumpOptions *dopt, CollInfo *collinfo)
{
PQExpBuffer query;
PQExpBuffer q;
@@ -11682,7 +11649,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
const char *collctype;
/* Skip if not to be dumped */
- if (!collinfo->dobj.dump || dataOnly)
+ if (!collinfo->dobj.dump || dopt->dataOnly)
return;
query = createPQExpBuffer();
@@ -11726,7 +11693,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
appendPQExpBuffer(labelq, "COLLATION %s", fmtId(collinfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &collinfo->dobj, labelq->data);
ArchiveEntry(fout, collinfo->dobj.catId, collinfo->dobj.dumpId,
@@ -11740,7 +11707,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
NULL, NULL);
/* Dump Collation Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
collinfo->dobj.namespace->dobj.name, collinfo->rolname,
collinfo->dobj.catId, 0, collinfo->dobj.dumpId);
@@ -11757,7 +11724,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
* write out a single conversion definition
*/
static void
-dumpConversion(Archive *fout, ConvInfo *convinfo)
+dumpConversion(Archive *fout, DumpOptions *dopt, ConvInfo *convinfo)
{
PQExpBuffer query;
PQExpBuffer q;
@@ -11774,7 +11741,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
bool condefault;
/* Skip if not to be dumped */
- if (!convinfo->dobj.dump || dataOnly)
+ if (!convinfo->dobj.dump || dopt->dataOnly)
return;
query = createPQExpBuffer();
@@ -11825,7 +11792,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
appendPQExpBuffer(labelq, "CONVERSION %s", fmtId(convinfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &convinfo->dobj, labelq->data);
ArchiveEntry(fout, convinfo->dobj.catId, convinfo->dobj.dumpId,
@@ -11839,7 +11806,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
NULL, NULL);
/* Dump Conversion Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
convinfo->dobj.namespace->dobj.name, convinfo->rolname,
convinfo->dobj.catId, 0, convinfo->dobj.dumpId);
@@ -11896,7 +11863,7 @@ format_aggregate_signature(AggInfo *agginfo, Archive *fout, bool honor_quotes)
* write out a single aggregate definition
*/
static void
-dumpAgg(Archive *fout, AggInfo *agginfo)
+dumpAgg(Archive *fout, DumpOptions *dopt, AggInfo *agginfo)
{
PQExpBuffer query;
PQExpBuffer q;
@@ -11942,7 +11909,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
bool convertok;
/* Skip if not to be dumped */
- if (!agginfo->aggfn.dobj.dump || dataOnly)
+ if (!agginfo->aggfn.dobj.dump || dopt->dataOnly)
return;
query = createPQExpBuffer();
@@ -12221,7 +12188,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
appendPQExpBuffer(labelq, "AGGREGATE %s", aggsig);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &agginfo->aggfn.dobj, labelq->data);
ArchiveEntry(fout, agginfo->aggfn.dobj.catId, agginfo->aggfn.dobj.dumpId,
@@ -12235,10 +12202,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
NULL, NULL);
/* Dump Aggregate Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
agginfo->aggfn.dobj.namespace->dobj.name, agginfo->aggfn.rolname,
agginfo->aggfn.dobj.catId, 0, agginfo->aggfn.dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
agginfo->aggfn.dobj.namespace->dobj.name, agginfo->aggfn.rolname,
agginfo->aggfn.dobj.catId, 0, agginfo->aggfn.dobj.dumpId);
@@ -12253,7 +12220,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
aggsig = format_function_signature(fout, &agginfo->aggfn, true);
aggsig_tag = format_function_signature(fout, &agginfo->aggfn, false);
- dumpACL(fout, agginfo->aggfn.dobj.catId, agginfo->aggfn.dobj.dumpId,
+ dumpACL(fout, dopt, agginfo->aggfn.dobj.catId, agginfo->aggfn.dobj.dumpId,
"FUNCTION",
aggsig, NULL, aggsig_tag,
agginfo->aggfn.dobj.namespace->dobj.name,
@@ -12278,14 +12245,14 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
* write out a single text search parser
*/
static void
-dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
+dumpTSParser(Archive *fout, DumpOptions *dopt, TSParserInfo *prsinfo)
{
PQExpBuffer q;
PQExpBuffer delq;
PQExpBuffer labelq;
/* Skip if not to be dumped */
- if (!prsinfo->dobj.dump || dataOnly)
+ if (!prsinfo->dobj.dump || dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -12321,7 +12288,7 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
appendPQExpBuffer(labelq, "TEXT SEARCH PARSER %s",
fmtId(prsinfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &prsinfo->dobj, labelq->data);
ArchiveEntry(fout, prsinfo->dobj.catId, prsinfo->dobj.dumpId,
@@ -12335,7 +12302,7 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
NULL, NULL);
/* Dump Parser Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, "",
prsinfo->dobj.catId, 0, prsinfo->dobj.dumpId);
@@ -12349,7 +12316,7 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
* write out a single text search dictionary
*/
static void
-dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
+dumpTSDictionary(Archive *fout, DumpOptions *dopt, TSDictInfo *dictinfo)
{
PQExpBuffer q;
PQExpBuffer delq;
@@ -12360,7 +12327,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
char *tmplname;
/* Skip if not to be dumped */
- if (!dictinfo->dobj.dump || dataOnly)
+ if (!dictinfo->dobj.dump || dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -12408,7 +12375,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
appendPQExpBuffer(labelq, "TEXT SEARCH DICTIONARY %s",
fmtId(dictinfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &dictinfo->dobj, labelq->data);
ArchiveEntry(fout, dictinfo->dobj.catId, dictinfo->dobj.dumpId,
@@ -12422,7 +12389,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
NULL, NULL);
/* Dump Dictionary Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, dictinfo->rolname,
dictinfo->dobj.catId, 0, dictinfo->dobj.dumpId);
@@ -12437,14 +12404,14 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
* write out a single text search template
*/
static void
-dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
+dumpTSTemplate(Archive *fout, DumpOptions *dopt, TSTemplateInfo *tmplinfo)
{
PQExpBuffer q;
PQExpBuffer delq;
PQExpBuffer labelq;
/* Skip if not to be dumped */
- if (!tmplinfo->dobj.dump || dataOnly)
+ if (!tmplinfo->dobj.dump || dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -12474,7 +12441,7 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
appendPQExpBuffer(labelq, "TEXT SEARCH TEMPLATE %s",
fmtId(tmplinfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &tmplinfo->dobj, labelq->data);
ArchiveEntry(fout, tmplinfo->dobj.catId, tmplinfo->dobj.dumpId,
@@ -12488,7 +12455,7 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
NULL, NULL);
/* Dump Template Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, "",
tmplinfo->dobj.catId, 0, tmplinfo->dobj.dumpId);
@@ -12502,7 +12469,7 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
* write out a single text search configuration
*/
static void
-dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
+dumpTSConfig(Archive *fout, DumpOptions *dopt, TSConfigInfo *cfginfo)
{
PQExpBuffer q;
PQExpBuffer delq;
@@ -12517,7 +12484,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
int i_dictname;
/* Skip if not to be dumped */
- if (!cfginfo->dobj.dump || dataOnly)
+ if (!cfginfo->dobj.dump || dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -12602,7 +12569,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
appendPQExpBuffer(labelq, "TEXT SEARCH CONFIGURATION %s",
fmtId(cfginfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &cfginfo->dobj, labelq->data);
ArchiveEntry(fout, cfginfo->dobj.catId, cfginfo->dobj.dumpId,
@@ -12616,7 +12583,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
NULL, NULL);
/* Dump Configuration Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, cfginfo->rolname,
cfginfo->dobj.catId, 0, cfginfo->dobj.dumpId);
@@ -12631,7 +12598,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
* write out a single foreign-data wrapper definition
*/
static void
-dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
+dumpForeignDataWrapper(Archive *fout, DumpOptions *dopt, FdwInfo *fdwinfo)
{
PQExpBuffer q;
PQExpBuffer delq;
@@ -12639,7 +12606,7 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
char *qfdwname;
/* Skip if not to be dumped */
- if (!fdwinfo->dobj.dump || dataOnly)
+ if (!fdwinfo->dobj.dump || dopt->dataOnly)
return;
/*
@@ -12647,7 +12614,7 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
* field. Otherwise omit them if we are only dumping some specific object.
*/
if (!fdwinfo->dobj.ext_member)
- if (!include_everything)
+ if (!dopt->include_everything)
return;
q = createPQExpBuffer();
@@ -12676,7 +12643,7 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
appendPQExpBuffer(labelq, "FOREIGN DATA WRAPPER %s",
qfdwname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &fdwinfo->dobj, labelq->data);
ArchiveEntry(fout, fdwinfo->dobj.catId, fdwinfo->dobj.dumpId,
@@ -12690,14 +12657,14 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
NULL, NULL);
/* Handle the ACL */
- dumpACL(fout, fdwinfo->dobj.catId, fdwinfo->dobj.dumpId,
+ dumpACL(fout, dopt, fdwinfo->dobj.catId, fdwinfo->dobj.dumpId,
"FOREIGN DATA WRAPPER",
qfdwname, NULL, fdwinfo->dobj.name,
NULL, fdwinfo->rolname,
fdwinfo->fdwacl);
/* Dump Foreign Data Wrapper Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, fdwinfo->rolname,
fdwinfo->dobj.catId, 0, fdwinfo->dobj.dumpId);
@@ -12713,7 +12680,7 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
* write out a foreign server definition
*/
static void
-dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
+dumpForeignServer(Archive *fout, DumpOptions *dopt, ForeignServerInfo *srvinfo)
{
PQExpBuffer q;
PQExpBuffer delq;
@@ -12724,7 +12691,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
char *fdwname;
/* Skip if not to be dumped */
- if (!srvinfo->dobj.dump || dataOnly || !include_everything)
+ if (!srvinfo->dobj.dump || dopt->dataOnly || !dopt->include_everything)
return;
q = createPQExpBuffer();
@@ -12768,7 +12735,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
appendPQExpBuffer(labelq, "SERVER %s", qsrvname);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &srvinfo->dobj, labelq->data);
ArchiveEntry(fout, srvinfo->dobj.catId, srvinfo->dobj.dumpId,
@@ -12782,7 +12749,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
NULL, NULL);
/* Handle the ACL */
- dumpACL(fout, srvinfo->dobj.catId, srvinfo->dobj.dumpId,
+ dumpACL(fout, dopt, srvinfo->dobj.catId, srvinfo->dobj.dumpId,
"FOREIGN SERVER",
qsrvname, NULL, srvinfo->dobj.name,
NULL, srvinfo->rolname,
@@ -12795,7 +12762,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
srvinfo->dobj.catId, srvinfo->dobj.dumpId);
/* Dump Foreign Server Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, srvinfo->rolname,
srvinfo->dobj.catId, 0, srvinfo->dobj.dumpId);
@@ -12911,14 +12878,14 @@ dumpUserMappings(Archive *fout,
* Write out default privileges information
*/
static void
-dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo)
+dumpDefaultACL(Archive *fout, DumpOptions *dopt, DefaultACLInfo *daclinfo)
{
PQExpBuffer q;
PQExpBuffer tag;
const char *type;
/* Skip if not to be dumped */
- if (!daclinfo->dobj.dump || dataOnly || aclsSkip)
+ if (!daclinfo->dobj.dump || dopt->dataOnly || dopt->aclsSkip)
return;
q = createPQExpBuffer();
@@ -12991,7 +12958,7 @@ dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo)
*----------
*/
static void
-dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
+dumpACL(Archive *fout, DumpOptions *dopt, CatalogId objCatId, DumpId objDumpId,
const char *type, const char *name, const char *subname,
const char *tag, const char *nspname, const char *owner,
const char *acls)
@@ -12999,11 +12966,11 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
PQExpBuffer sql;
/* Do nothing if ACL dump is not enabled */
- if (aclsSkip)
+ if (dopt->aclsSkip)
return;
/* --data-only skips ACLs *except* BLOB ACLs */
- if (dataOnly && strcmp(type, "LARGE OBJECT") != 0)
+ if (dopt->dataOnly && strcmp(type, "LARGE OBJECT") != 0)
return;
sql = createPQExpBuffer();
@@ -13046,7 +13013,7 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
* calling ArchiveEntry() for the specified object.
*/
static void
-dumpSecLabel(Archive *fout, const char *target,
+dumpSecLabel(Archive *fout, DumpOptions *dopt, const char *target,
const char *namespace, const char *owner,
CatalogId catalogId, int subid, DumpId dumpId)
{
@@ -13056,18 +13023,18 @@ dumpSecLabel(Archive *fout, const char *target,
PQExpBuffer query;
/* do nothing, if --no-security-labels is supplied */
- if (no_security_labels)
+ if (dopt->no_security_labels)
return;
/* Comments are schema not data ... except blob comments are data */
if (strncmp(target, "LARGE OBJECT ", 13) != 0)
{
- if (dataOnly)
+ if (dopt->dataOnly)
return;
}
else
{
- if (schemaOnly)
+ if (dopt->schemaOnly)
return;
}
@@ -13110,7 +13077,7 @@ dumpSecLabel(Archive *fout, const char *target,
* and its columns.
*/
static void
-dumpTableSecLabel(Archive *fout, TableInfo *tbinfo, const char *reltypename)
+dumpTableSecLabel(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo, const char *reltypename)
{
SecLabelItem *labels;
int nlabels;
@@ -13119,11 +13086,11 @@ dumpTableSecLabel(Archive *fout, TableInfo *tbinfo, const char *reltypename)
PQExpBuffer target;
/* do nothing, if --no-security-labels is supplied */
- if (no_security_labels)
+ if (dopt->no_security_labels)
return;
/* SecLabel are SCHEMA not data */
- if (dataOnly)
+ if (dopt->dataOnly)
return;
/* Search for comments associated with relation, using table */
@@ -13331,20 +13298,20 @@ collectSecLabels(Archive *fout, SecLabelItem **items)
* write out to fout the declarations (not data) of a user-defined table
*/
static void
-dumpTable(Archive *fout, TableInfo *tbinfo)
+dumpTable(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo)
{
- if (tbinfo->dobj.dump && !dataOnly)
+ if (tbinfo->dobj.dump && !dopt->dataOnly)
{
char *namecopy;
if (tbinfo->relkind == RELKIND_SEQUENCE)
- dumpSequence(fout, tbinfo);
+ dumpSequence(fout, dopt, tbinfo);
else
- dumpTableSchema(fout, tbinfo);
+ dumpTableSchema(fout, dopt, tbinfo);
/* Handle the ACL here */
namecopy = pg_strdup(fmtId(tbinfo->dobj.name));
- dumpACL(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId,
+ dumpACL(fout, dopt, tbinfo->dobj.catId, tbinfo->dobj.dumpId,
(tbinfo->relkind == RELKIND_SEQUENCE) ? "SEQUENCE" :
"TABLE",
namecopy, NULL, tbinfo->dobj.name,
@@ -13379,7 +13346,7 @@ dumpTable(Archive *fout, TableInfo *tbinfo)
attnamecopy = pg_strdup(fmtId(attname));
acltag = psprintf("%s.%s", tbinfo->dobj.name, attname);
/* Column's GRANT type is always TABLE */
- dumpACL(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId, "TABLE",
+ dumpACL(fout, dopt, tbinfo->dobj.catId, tbinfo->dobj.dumpId, "TABLE",
namecopy, attnamecopy, acltag,
tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
attacl);
@@ -13456,7 +13423,7 @@ createViewAsClause(Archive *fout, TableInfo *tbinfo)
* write the declaration (not data) of one user-defined table or view
*/
static void
-dumpTableSchema(Archive *fout, TableInfo *tbinfo)
+dumpTableSchema(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo)
{
PQExpBuffer q = createPQExpBuffer();
PQExpBuffer delq = createPQExpBuffer();
@@ -13474,7 +13441,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
/* Make sure we are in proper schema */
selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_type_oids_by_rel_oid(fout, q,
tbinfo->dobj.catId.oid);
@@ -13494,7 +13461,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
appendPQExpBuffer(delq, "%s;\n",
fmtId(tbinfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_pg_class_oids(fout, q,
tbinfo->dobj.catId.oid, false);
@@ -13574,7 +13541,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
appendPQExpBuffer(labelq, "%s %s", reltypename,
fmtId(tbinfo->dobj.name));
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_pg_class_oids(fout, q,
tbinfo->dobj.catId.oid, false);
@@ -13588,7 +13555,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
* Attach to type, if reloftype; except in case of a binary upgrade,
* we dump the table normally and attach it to the type afterward.
*/
- if (tbinfo->reloftype && !binary_upgrade)
+ if (tbinfo->reloftype && !dopt->binary_upgrade)
appendPQExpBuffer(q, " OF %s", tbinfo->reloftype);
if (tbinfo->relkind != RELKIND_MATVIEW)
@@ -13603,7 +13570,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
* columns, and then fix up the dropped and nonlocal cases
* below.
*/
- if (shouldPrintColumn(tbinfo, j))
+ if (shouldPrintColumn(dopt, tbinfo, j))
{
/*
* Default value --- suppress if to be printed separately.
@@ -13617,11 +13584,11 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
*/
bool has_notnull = (tbinfo->notnull[j] &&
(!tbinfo->inhNotNull[j] ||
- binary_upgrade));
+ dopt->binary_upgrade));
/* Skip column if fully defined by reloftype */
if (tbinfo->reloftype &&
- !has_default && !has_notnull && !binary_upgrade)
+ !has_default && !has_notnull && !dopt->binary_upgrade)
continue;
/* Format properly if not first attr */
@@ -13649,7 +13616,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
}
/* Attribute type */
- if (tbinfo->reloftype && !binary_upgrade)
+ if (tbinfo->reloftype && !dopt->binary_upgrade)
{
appendPQExpBufferStr(q, " WITH OPTIONS");
}
@@ -13714,7 +13681,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
if (actual_atts)
appendPQExpBufferStr(q, "\n)");
- else if (!(tbinfo->reloftype && !binary_upgrade))
+ else if (!(tbinfo->reloftype && !dopt->binary_upgrade))
{
/*
* We must have a parenthesized attribute list, even though
@@ -13723,7 +13690,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
appendPQExpBufferStr(q, " (\n)");
}
- if (numParents > 0 && !binary_upgrade)
+ if (numParents > 0 && !dopt->binary_upgrade)
{
appendPQExpBufferStr(q, "\nINHERITS (");
for (k = 0; k < numParents; k++)
@@ -13796,7 +13763,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
* attislocal correctly, plus fix up any inherited CHECK constraints.
* Analogously, we set up typed tables using ALTER TABLE / OF here.
*/
- if (binary_upgrade && (tbinfo->relkind == RELKIND_RELATION ||
+ if (dopt->binary_upgrade && (tbinfo->relkind == RELKIND_RELATION ||
tbinfo->relkind == RELKIND_FOREIGN_TABLE))
{
for (j = 0; j < tbinfo->numatts; j++)
@@ -13912,7 +13879,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
* REFRESH MATERIALIZED VIEW since it's possible that some underlying
* matview is not populated even though this matview is.
*/
- if (binary_upgrade && tbinfo->relkind == RELKIND_MATVIEW &&
+ if (dopt->binary_upgrade && tbinfo->relkind == RELKIND_MATVIEW &&
tbinfo->relispopulated)
{
appendPQExpBufferStr(q, "\n-- For binary upgrade, mark materialized view as populated\n");
@@ -13938,7 +13905,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
* it is NOT NULL and did not inherit that property from a parent,
* we have to mark it separately.
*/
- if (!shouldPrintColumn(tbinfo, j) &&
+ if (!shouldPrintColumn(dopt, tbinfo, j) &&
tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
{
appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
@@ -14052,7 +14019,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
}
}
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(q, &tbinfo->dobj, labelq->data);
ArchiveEntry(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId,
@@ -14069,10 +14036,10 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
/* Dump Table Comments */
- dumpTableComment(fout, tbinfo, reltypename);
+ dumpTableComment(fout, dopt, tbinfo, reltypename);
/* Dump Table Security Labels */
- dumpTableSecLabel(fout, tbinfo, reltypename);
+ dumpTableSecLabel(fout, dopt, tbinfo, reltypename);
/* Dump comments on inlined table constraints */
for (j = 0; j < tbinfo->ncheck; j++)
@@ -14082,7 +14049,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
if (constr->separate || !constr->conislocal)
continue;
- dumpTableConstraintComment(fout, constr);
+ dumpTableConstraintComment(fout, dopt, constr);
}
destroyPQExpBuffer(q);
@@ -14094,7 +14061,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
* dumpAttrDef --- dump an attribute's default-value declaration
*/
static void
-dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
+dumpAttrDef(Archive *fout, DumpOptions *dopt, AttrDefInfo *adinfo)
{
TableInfo *tbinfo = adinfo->adtable;
int adnum = adinfo->adnum;
@@ -14102,7 +14069,7 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
PQExpBuffer delq;
/* Skip if table definition not to be dumped */
- if (!tbinfo->dobj.dump || dataOnly)
+ if (!tbinfo->dobj.dump || dopt->dataOnly)
return;
/* Skip if not "separate"; it was dumped in the table's definition */
@@ -14181,7 +14148,7 @@ getAttrName(int attrnum, TableInfo *tblInfo)
* write out to fout a user-defined index
*/
static void
-dumpIndex(Archive *fout, IndxInfo *indxinfo)
+dumpIndex(Archive *fout, DumpOptions *dopt, IndxInfo *indxinfo)
{
TableInfo *tbinfo = indxinfo->indextable;
bool is_constraint = (indxinfo->indexconstraint != 0);
@@ -14189,7 +14156,7 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
PQExpBuffer delq;
PQExpBuffer labelq;
- if (dataOnly)
+ if (dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -14208,7 +14175,7 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
*/
if (!is_constraint)
{
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_pg_class_oids(fout, q,
indxinfo->dobj.catId.oid, true);
@@ -14254,7 +14221,7 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
}
/* Dump Index Comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tbinfo->dobj.namespace->dobj.name,
tbinfo->rolname,
indxinfo->dobj.catId, 0,
@@ -14271,14 +14238,14 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
* write out to fout a user-defined constraint
*/
static void
-dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
+dumpConstraint(Archive *fout, DumpOptions *dopt, ConstraintInfo *coninfo)
{
TableInfo *tbinfo = coninfo->contable;
PQExpBuffer q;
PQExpBuffer delq;
/* Skip if not to be dumped */
- if (!coninfo->dobj.dump || dataOnly)
+ if (!coninfo->dobj.dump || dopt->dataOnly)
return;
q = createPQExpBuffer();
@@ -14298,7 +14265,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
exit_horribly(NULL, "missing index for constraint \"%s\"\n",
coninfo->dobj.name);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_set_pg_class_oids(fout, q,
indxinfo->dobj.catId.oid, true);
@@ -14488,7 +14455,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
/* Dump Constraint Comments --- only works for table constraints */
if (tbinfo && coninfo->separate)
- dumpTableConstraintComment(fout, coninfo);
+ dumpTableConstraintComment(fout, dopt, coninfo);
destroyPQExpBuffer(q);
destroyPQExpBuffer(delq);
@@ -14502,7 +14469,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
* or as a separate ALTER command.
*/
static void
-dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo)
+dumpTableConstraintComment(Archive *fout, DumpOptions *dopt, ConstraintInfo *coninfo)
{
TableInfo *tbinfo = coninfo->contable;
PQExpBuffer labelq = createPQExpBuffer();
@@ -14511,7 +14478,7 @@ dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo)
fmtId(coninfo->dobj.name));
appendPQExpBuffer(labelq, "ON %s",
fmtId(tbinfo->dobj.name));
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tbinfo->dobj.namespace->dobj.name,
tbinfo->rolname,
coninfo->dobj.catId, 0,
@@ -14571,7 +14538,7 @@ findLastBuiltinOid_V70(Archive *fout)
* write the declaration (not data) of one user-defined sequence
*/
static void
-dumpSequence(Archive *fout, TableInfo *tbinfo)
+dumpSequence(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo)
{
PGresult *res;
char *startv,
@@ -14667,7 +14634,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
resetPQExpBuffer(query);
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
{
binary_upgrade_set_pg_class_oids(fout, query,
tbinfo->dobj.catId.oid, false);
@@ -14704,7 +14671,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
/* binary_upgrade: no need to clear TOAST table oid */
- if (binary_upgrade)
+ if (dopt->binary_upgrade)
binary_upgrade_extension_member(query, &tbinfo->dobj,
labelq->data);
@@ -14757,10 +14724,10 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
}
/* Dump Sequence Comments and Security Labels */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
tbinfo->dobj.catId, 0, tbinfo->dobj.dumpId);
- dumpSecLabel(fout, labelq->data,
+ dumpSecLabel(fout, dopt, labelq->data,
tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
tbinfo->dobj.catId, 0, tbinfo->dobj.dumpId);
@@ -14831,7 +14798,7 @@ dumpSequenceData(Archive *fout, TableDataInfo *tdinfo)
* write the declaration of one user-defined table trigger
*/
static void
-dumpTrigger(Archive *fout, TriggerInfo *tginfo)
+dumpTrigger(Archive *fout, DumpOptions *dopt, TriggerInfo *tginfo)
{
TableInfo *tbinfo = tginfo->tgtable;
PQExpBuffer query;
@@ -14846,7 +14813,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
* we needn't check dobj.dump because TriggerInfo wouldn't have been
* created in the first place for non-dumpable triggers
*/
- if (dataOnly)
+ if (dopt->dataOnly)
return;
query = createPQExpBuffer();
@@ -15027,7 +14994,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
NULL, 0,
NULL, NULL);
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
tginfo->dobj.catId, 0, tginfo->dobj.dumpId);
@@ -15041,13 +15008,13 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
* write the declaration of one user-defined event trigger
*/
static void
-dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
+dumpEventTrigger(Archive *fout, DumpOptions *dopt, EventTriggerInfo *evtinfo)
{
PQExpBuffer query;
PQExpBuffer labelq;
/* Skip if not to be dumped */
- if (!evtinfo->dobj.dump || dataOnly)
+ if (!evtinfo->dobj.dump || dopt->dataOnly)
return;
query = createPQExpBuffer();
@@ -15099,7 +15066,7 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
"EVENT TRIGGER", SECTION_POST_DATA,
query->data, "", NULL, NULL, 0, NULL, NULL);
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
NULL, NULL,
evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);
@@ -15112,7 +15079,7 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
* Dump a rule
*/
static void
-dumpRule(Archive *fout, RuleInfo *rinfo)
+dumpRule(Archive *fout, DumpOptions *dopt, RuleInfo *rinfo)
{
TableInfo *tbinfo = rinfo->ruletable;
PQExpBuffer query;
@@ -15122,7 +15089,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
PGresult *res;
/* Skip if not to be dumped */
- if (!rinfo->dobj.dump || dataOnly)
+ if (!rinfo->dobj.dump || dopt->dataOnly)
return;
/*
@@ -15227,7 +15194,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
NULL, NULL);
/* Dump rule comments */
- dumpComment(fout, labelq->data,
+ dumpComment(fout, dopt, labelq->data,
tbinfo->dobj.namespace->dobj.name,
tbinfo->rolname,
rinfo->dobj.catId, 0, rinfo->dobj.dumpId);
@@ -15244,7 +15211,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
* getExtensionMembership --- obtain extension membership data
*/
void
-getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
+getExtensionMembership(Archive *fout, DumpOptions *dopt, ExtensionInfo extinfo[],
int numExtensions)
{
PQExpBuffer query;
@@ -15341,7 +15308,7 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
* idea is to exactly reproduce the database contents rather than
* replace the extension contents with something different.
*/
- if (!binary_upgrade)
+ if (!dopt->binary_upgrade)
dobj->dump = false;
else
dobj->dump = refdobj->dump;
@@ -15420,7 +15387,7 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
* of the --oids setting. This is because row filtering
* conditions aren't compatible with dumping OIDs.
*/
- makeTableDataInfo(configtbl, false);
+ makeTableDataInfo(dopt, configtbl, false);
if (configtbl->dataObj != NULL)
{
if (strlen(extconditionarray[j]) > 0)
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index fd1184e..e81c390 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -522,7 +522,9 @@ extern char g_opaque_type[10]; /* name for the opaque type */
struct Archive;
typedef struct Archive Archive;
-extern TableInfo *getSchemaData(Archive *, int *numTablesPtr);
+struct _dumpOptions;
+
+extern TableInfo *getSchemaData(Archive *, struct _dumpOptions * dopt, int *numTablesPtr);
typedef enum _OidOptions
{
@@ -564,16 +566,16 @@ extern void sortDataAndIndexObjectsBySize(DumpableObject **objs, int numObjs);
* version specific routines
*/
extern NamespaceInfo *getNamespaces(Archive *fout, int *numNamespaces);
-extern ExtensionInfo *getExtensions(Archive *fout, int *numExtensions);
+extern ExtensionInfo *getExtensions(Archive *fout, struct _dumpOptions * dopt, int *numExtensions);
extern TypeInfo *getTypes(Archive *fout, int *numTypes);
-extern FuncInfo *getFuncs(Archive *fout, int *numFuncs);
-extern AggInfo *getAggregates(Archive *fout, int *numAggregates);
+extern FuncInfo *getFuncs(Archive *fout, struct _dumpOptions * dopt, int *numFuncs);
+extern AggInfo *getAggregates(Archive *fout, struct _dumpOptions * dopt, int *numAggregates);
extern OprInfo *getOperators(Archive *fout, int *numOperators);
extern OpclassInfo *getOpclasses(Archive *fout, int *numOpclasses);
extern OpfamilyInfo *getOpfamilies(Archive *fout, int *numOpfamilies);
extern CollInfo *getCollations(Archive *fout, int *numCollations);
extern ConvInfo *getConversions(Archive *fout, int *numConversions);
-extern TableInfo *getTables(Archive *fout, int *numTables);
+extern TableInfo *getTables(Archive *fout, struct _dumpOptions * dopt, int *numTables);
extern void getOwnedSeqs(Archive *fout, TableInfo tblinfo[], int numTables);
extern InhInfo *getInherits(Archive *fout, int *numInherits);
extern void getIndexes(Archive *fout, TableInfo tblinfo[], int numTables);
@@ -582,8 +584,8 @@ extern RuleInfo *getRules(Archive *fout, int *numRules);
extern void getTriggers(Archive *fout, TableInfo tblinfo[], int numTables);
extern ProcLangInfo *getProcLangs(Archive *fout, int *numProcLangs);
extern CastInfo *getCasts(Archive *fout, int *numCasts);
-extern void getTableAttrs(Archive *fout, TableInfo *tbinfo, int numTables);
-extern bool shouldPrintColumn(TableInfo *tbinfo, int colno);
+extern void getTableAttrs(Archive *fout, struct _dumpOptions * dopt, TableInfo *tbinfo, int numTables);
+extern bool shouldPrintColumn(struct _dumpOptions * dopt, TableInfo *tbinfo, int colno);
extern TSParserInfo *getTSParsers(Archive *fout, int *numTSParsers);
extern TSDictInfo *getTSDictionaries(Archive *fout, int *numTSDicts);
extern TSTemplateInfo *getTSTemplates(Archive *fout, int *numTSTemplates);
@@ -592,8 +594,8 @@ extern FdwInfo *getForeignDataWrappers(Archive *fout,
int *numForeignDataWrappers);
extern ForeignServerInfo *getForeignServers(Archive *fout,
int *numForeignServers);
-extern DefaultACLInfo *getDefaultACLs(Archive *fout, int *numDefaultACLs);
-extern void getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
+extern DefaultACLInfo *getDefaultACLs(Archive *fout, struct _dumpOptions * dopt, int *numDefaultACLs);
+extern void getExtensionMembership(Archive *fout, struct _dumpOptions * dopt, ExtensionInfo extinfo[],
int numExtensions);
extern EventTriggerInfo *getEventTriggers(Archive *fout, int *numEventTriggers);
extern void getRowSecurity(Archive *fout, TableInfo tblinfo[], int numTables);
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 21715dc..f954b3c 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -423,7 +423,7 @@ main(int argc, char **argv)
/* AH may be freed in CloseArchive? */
exit_code = AH->n_errors ? 1 : 0;
- CloseArchive(AH);
+ CloseArchive(AH, NULL);
return exit_code;
}
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
