diff options
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 6 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup_db.c | 12 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 4485d79649c..4863f943664 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -627,7 +627,13 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, _selectOutputSchema(AH, "pg_catalog"); + /* Send BLOB COMMENTS data to ExecuteSimpleCommands() */ + if (strcmp(te->desc, "BLOB COMMENTS") == 0) + AH->outputKind = OUTPUT_OTHERDATA; + (*AH->PrintTocDataPtr) (AH, te, ropt); + + AH->outputKind = OUTPUT_SQLCMDS; } else { diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c index d27ecf414d7..b5b778cde70 100644 --- a/src/bin/pg_dump/pg_backup_db.c +++ b/src/bin/pg_dump/pg_backup_db.c @@ -428,9 +428,14 @@ ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc) * identifiers, so that we can recognize statement-terminating semicolons. * We assume that INSERT data will not contain SQL comments, E'' literals, * or dollar-quoted strings, so this is much simpler than a full SQL lexer. + * + * Note: when restoring from a pre-9.0 dump file, this code is also used to + * process BLOB COMMENTS data, which has the same problem of containing + * multiple SQL commands that might be split across bufferloads. Fortunately, + * that data won't contain anything complicated to lex either. */ static void -ExecuteInsertCommands(ArchiveHandle *AH, const char *buf, size_t bufLen) +ExecuteSimpleCommands(ArchiveHandle *AH, const char *buf, size_t bufLen) { const char *qry = buf; const char *eos = buf + bufLen; @@ -514,9 +519,10 @@ ExecuteSqlCommandBuf(ArchiveHandle *AH, const char *buf, size_t bufLen) else if (AH->outputKind == OUTPUT_OTHERDATA) { /* - * Table data expressed as INSERT commands. + * Table data expressed as INSERT commands; or, in old dump files, + * BLOB COMMENTS data (which is expressed as COMMENT ON commands). */ - ExecuteInsertCommands(AH, buf, bufLen); + ExecuteSimpleCommands(AH, buf, bufLen); } else { diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 308ac27943d..5f3b5dc0d59 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -1539,7 +1539,7 @@ dumpTableData_copy(Archive *fout, void *dcontext) * * Caution: when we restore from an archive file direct to database, the * INSERT commands emitted by this function have to be parsed by - * pg_backup_db.c's ExecuteInsertCommands(), which will not handle comments, + * pg_backup_db.c's ExecuteSimpleCommands(), which will not handle comments, * E'' strings, or dollar-quoted strings. So don't emit anything like that. */ static int |