Fix pg_restore's processing of old-style BLOB COMMENTS data.

Prior to 9.0, pg_dump handled comments on large objects by dumping a bunch
of COMMENT commands into a single BLOB COMMENTS archive object.  With
sufficiently many such comments, some of the commands would likely get
split across bufferloads when restoring, causing failures in
direct-to-database restores (though no problem would be evident in text
output).  This is the same type of issue we have with table data dumped as
INSERT commands, and it can be fixed in the same way, by using a mini SQL
lexer to figure out where the command boundaries are.  Fortunately, the
COMMENT commands are no more complex to lex than INSERTs, so we can just
re-use the existing lexer for INSERTs.

Per bug #10611 from Jacek Zalewski.  Back-patch to all active branches.

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index fe930739af4858c23f1d47163d1cdbc91fd9c29c..c0c05dfd40c1eeaa39e83cccc4565f6cb734818a 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -547,7 +547,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 236f7e2e9662e81ffa08731bd6c070c806f306bc..5d0732fd2f3f5c485f6cc9ca254fdc6ee9d3f9a8 100644 (file)
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -333,9 +333,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;
@@ -419,9 +424,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 77ba04b43516576fadf403b8978621bdb0adaecf..14c900a1b0e5e70cd2c256c2fd5dc97c46b9ef99 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -1219,7 +1219,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