Fix some more not-schema-aware queries in pg_dump. Also fix some places

that would do the wrong thing with BLOB OIDs exceeding 2G.

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 1afdccd000a4183a996ae8fc28480d65ccce80ba..7dc436e7d5fe0ba7dd478749b96091e538eee432 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -525,14 +525,15 @@ _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *rop
        ahprintf(AH, "-- Disable triggers\n");
 
        /*
-        * Just update the AFFECTED table, if known.
+        * Just update the AFFECTED table, if known.  Otherwise update all
+        * non-system tables.
         */
        if (te && te->name && strlen(te->name) > 0)
-               ahprintf(AH, "UPDATE pg_class SET reltriggers = 0 "
-                                "WHERE oid = '%s'::regclass;\n\n",
+               ahprintf(AH, "UPDATE pg_catalog.pg_class SET reltriggers = 0 "
+                                "WHERE oid = '%s'::pg_catalog.regclass;\n\n",
                                 fmtId(te->name, false));
        else
-               ahprintf(AH, "UPDATE pg_class SET reltriggers = 0 FROM pg_namespace "
+               ahprintf(AH, "UPDATE pg_catalog.pg_class SET reltriggers = 0 FROM pg_catalog.pg_namespace "
                                 "WHERE relnamespace = pg_namespace.oid AND nspname !~ '^pg_';\n\n");
 
        /*
@@ -591,17 +592,18 @@ _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt
        ahprintf(AH, "-- Enable triggers\n");
 
        /*
-        * Just update the AFFECTED table, if known.
+        * Just update the AFFECTED table, if known.  Otherwise update all
+        * non-system tables.
         */
        if (te && te->name && strlen(te->name) > 0)
-               ahprintf(AH, "UPDATE pg_class SET reltriggers = "
-                                "(SELECT count(*) FROM pg_trigger where pg_class.oid = tgrelid) "
-                                "WHERE oid = '%s'::regclass;\n\n",
+               ahprintf(AH, "UPDATE pg_catalog.pg_class SET reltriggers = "
+                                "(SELECT count(*) FROM pg_catalog.pg_trigger where pg_class.oid = tgrelid) "
+                                "WHERE oid = '%s'::pg_catalog.regclass;\n\n",
                                 fmtId(te->name, false));
        else
-               ahprintf(AH, "UPDATE pg_class SET reltriggers = "
-                                "(SELECT count(*) FROM pg_trigger where pg_class.oid = tgrelid) "
-                                "FROM pg_namespace "
+               ahprintf(AH, "UPDATE pg_catalog.pg_class SET reltriggers = "
+                                "(SELECT count(*) FROM pg_catalog.pg_trigger where pg_class.oid = tgrelid) "
+                                "FROM pg_catalog.pg_namespace "
                                 "WHERE relnamespace = pg_namespace.oid AND nspname !~ '^pg_';\n\n");
 
        /*
@@ -856,18 +858,20 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid)
 void
 EndRestoreBlob(ArchiveHandle *AH, Oid oid)
 {
-        if(AH->lo_buf_used > 0) {
-         /* Write remaining bytes from the LO buffer */
-         int res;
-          res = lo_write(AH->connection, AH->loFd, (void *) AH->lo_buf, AH->lo_buf_used);
+       if (AH->lo_buf_used > 0)
+       {
+               /* Write remaining bytes from the LO buffer */
+               int res;
+
+               res = lo_write(AH->connection, AH->loFd, (void *) AH->lo_buf, AH->lo_buf_used);
 
-         ahlog(AH, 5, "wrote remaining %d bytes of large object data (result = %d)\n",
-                 (int)AH->lo_buf_used, res);
-         if (res != AH->lo_buf_used)
-               die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n",
-                        res, AH->lo_buf_used);
-          AH->lo_buf_used = 0;
-        }
+               ahlog(AH, 5, "wrote remaining %d bytes of large object data (result = %d)\n",
+                         (int)AH->lo_buf_used, res);
+               if (res != AH->lo_buf_used)
+                       die_horribly(AH, modulename, "could not write to large object (result: %d, expected: %d)\n",
+                                                res, AH->lo_buf_used);
+               AH->lo_buf_used = 0;
+       }
 
        lo_close(AH->connection, AH->loFd);
        AH->writingBlob = 0;
@@ -1444,7 +1448,7 @@ WriteInt(ArchiveHandle *AH, int i)
        for (b = 0; b < AH->intSize; b++)
        {
                (*AH->WriteBytePtr) (AH, i & 0xFF);
-               i = i / 256;
+               i >>= 8;
        }
 
        return AH->intSize + 1;

diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 6a741eb15cd9d682701e7c4d53b0c3861fb63c9f..7cfdae86f98671c27dd13abbb2706015e19dd40e 100644 (file)
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -638,7 +638,7 @@ _PrintData(ArchiveHandle *AH)
 static void
 _LoadBlobs(ArchiveHandle *AH)
 {
-       int                     oid;
+       Oid                     oid;
 
        StartRestoreBlobs(AH);
 
@@ -664,7 +664,7 @@ _LoadBlobs(ArchiveHandle *AH)
 static void
 _skipBlobs(ArchiveHandle *AH)
 {
-       int                     oid;
+       Oid                     oid;
 
        oid = ReadInt(AH);
        while (oid != 0)

diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index c100466a1126d97196a3b731a862e3f314fac9a4..87d770dc4b98f69f4d5e4d340cf1e55539bf2bbb 100644 (file)
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -729,7 +729,7 @@ FixupBlobRefs(ArchiveHandle *AH, TocEntry *te)
        appendPQExpBuffer(tblQry,
                                          "SELECT a.attname FROM "
                                          "pg_catalog.pg_attribute a, pg_catalog.pg_type t "
-                                         "WHERE a.attnum > 0 AND a.attrelid = '%s'::regclass "
+                                         "WHERE a.attnum > 0 AND a.attrelid = '%s'::pg_catalog.regclass "
                                          "AND a.atttypid = t.oid AND t.typname in ('oid', 'lo')",
                                          tblName->data);
 
@@ -799,7 +799,7 @@ CreateBlobXrefTable(ArchiveHandle *AH)
 
        ahlog(AH, 1, "creating table for large object cross-references\n");
 
-       appendPQExpBuffer(qry, "Create Temporary Table %s(oldOid oid, newOid oid);", BLOB_XREF_TABLE);
+       appendPQExpBuffer(qry, "Create Temporary Table %s(oldOid pg_catalog.oid, newOid pg_catalog.oid);", BLOB_XREF_TABLE);
 
        ExecuteSqlCommand(AH, qry, "could not create large object cross-reference table", true);
 
@@ -812,11 +812,13 @@ CreateBlobXrefTable(ArchiveHandle *AH)
 }
 
 void
-InsertBlobXref(ArchiveHandle *AH, int old, int new)
+InsertBlobXref(ArchiveHandle *AH, Oid old, Oid new)
 {
        PQExpBuffer qry = createPQExpBuffer();
 
-       appendPQExpBuffer(qry, "Insert Into %s(oldOid, newOid) Values (%d, %d);", BLOB_XREF_TABLE, old, new);
+       appendPQExpBuffer(qry,
+                                         "Insert Into %s(oldOid, newOid) Values ('%u', '%u');",
+                                         BLOB_XREF_TABLE, old, new);
 
        ExecuteSqlCommand(AH, qry, "could not create large object cross-reference entry", true);
 

diff --git a/src/bin/pg_dump/pg_backup_db.h b/src/bin/pg_dump/pg_backup_db.h
index 5aa8c6ef8d807a74c9d4e9f4d79b60a52f2611bd..80fbc5bb68a5ed69b9ab055625aa183a052500a3 100644 (file)
--- a/src/bin/pg_dump/pg_backup_db.h
+++ b/src/bin/pg_dump/pg_backup_db.h
@@ -12,7 +12,7 @@ extern int    ExecuteSqlCommand(ArchiveHandle *AH, PQExpBuffer qry, char *desc, boo
 extern int     ExecuteSqlCommandBuf(ArchiveHandle *AH, void *qry, int bufLen);
 
 extern void CreateBlobXrefTable(ArchiveHandle *AH);
-extern void InsertBlobXref(ArchiveHandle *AH, int old, int new);
+extern void InsertBlobXref(ArchiveHandle *AH, Oid old, Oid new);
 extern void StartTransaction(ArchiveHandle *AH);
 extern void StartTransactionXref(ArchiveHandle *AH);
 extern void CommitTransaction(ArchiveHandle *AH);

diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c
index 38cc5dcd99d436cfe7b7f0ec9f77cfbb9a500e31..0b250acd130ec54e262ac22ee821da9bb53206c2 100644 (file)
--- a/src/bin/pg_dump/pg_backup_files.c
+++ b/src/bin/pg_dump/pg_backup_files.c
@@ -76,7 +76,7 @@ typedef struct
 
 static char *modulename = gettext_noop("file archiver");
 static void _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt);
-static void _getBlobTocEntry(ArchiveHandle *AH, int *oid, char *fname);
+static void _getBlobTocEntry(ArchiveHandle *AH, Oid *oid, char *fname);
 
 /*
  *     Initializer
@@ -328,7 +328,7 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt)
 }
 
 static void
-_getBlobTocEntry(ArchiveHandle *AH, int *oid, char fname[K_STD_BUF_SIZE])
+_getBlobTocEntry(ArchiveHandle *AH, Oid *oid, char fname[K_STD_BUF_SIZE])
 {
        lclContext *ctx = (lclContext *) AH->formatData;
        char            blobTe[K_STD_BUF_SIZE];
@@ -337,7 +337,7 @@ _getBlobTocEntry(ArchiveHandle *AH, int *oid, char fname[K_STD_BUF_SIZE])
 
        if (fgets(&blobTe[0], K_STD_BUF_SIZE - 1, ctx->blobToc) != NULL)
        {
-               *oid = atoi(blobTe);
+               *oid = atooid(blobTe);
 
                fpos = strcspn(blobTe, " ");
 
@@ -360,7 +360,7 @@ _getBlobTocEntry(ArchiveHandle *AH, int *oid, char fname[K_STD_BUF_SIZE])
 static void
 _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
 {
-       int                     oid;
+       Oid                     oid;
        lclContext *ctx = (lclContext *) AH->formatData;
        char            fname[K_STD_BUF_SIZE];
 
@@ -509,9 +509,9 @@ _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid)
                sfx = "";
 
        sprintf(fmode, "wb%d", AH->compression);
-       sprintf(fname, "blob_%d.dat%s", oid, sfx);
+       sprintf(fname, "blob_%u.dat%s", oid, sfx);
 
-       fprintf(ctx->blobToc, "%d %s\n", oid, fname);
+       fprintf(ctx->blobToc, "%u %s\n", oid, fname);
 
 #ifdef HAVE_LIBZ
        tctx->FH = gzopen(fname, fmode);

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index 313bc6d83f982747ecfcca5bbd8f16875d61e914..364e7742b57ce39c39aba005a133b92159651ed9 100644 (file)
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -666,34 +666,6 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt)
                _PrintFileData(AH, tctx->filename, ropt);
 }
 
-/* static void _getBlobTocEntry(ArchiveHandle* AH, int *oid, char fname[K_STD_BUF_SIZE])
- * {
- *     lclContext*             ctx = (lclContext*)AH->formatData;
- *     char                    blobTe[K_STD_BUF_SIZE];
- *     int                             fpos;
- *     int                             eos;
- *
- *     if (tarGets(&blobTe[0], K_STD_BUF_SIZE - 1, ctx->blobToc) != NULL)
- *     {
- *             *oid = atoi(blobTe);
- *
- *             fpos = strcspn(blobTe, " ");
- *
- *             strncpy(fname, &blobTe[fpos+1], K_STD_BUF_SIZE - 1);
- *
- *             eos = strlen(fname)-1;
- *
- *             if (fname[eos] == '\n')
- *                     fname[eos] = '\0';
- *
- *     } else {
- *
- *             *oid = 0;
- *             fname[0] = '\0';
- *     }
- *}
- */
-
 static void
 _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
 {
@@ -710,20 +682,22 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
        {
                ctx->FH = th;
 
-               oid = (Oid) strtoul(&th->targetFile[5], NULL, 10);
-
-               if (strncmp(th->targetFile, "blob_", 5) == 0 && oid != 0)
+               if (strncmp(th->targetFile, "blob_", 5) == 0)
                {
-                       ahlog(AH, 1, "restoring large object OID %u\n", oid);
+                       oid = atooid(&th->targetFile[5]);
+                       if (oid != 0)
+                       {
+                               ahlog(AH, 1, "restoring large object OID %u\n", oid);
 
-                       StartRestoreBlob(AH, oid);
+                               StartRestoreBlob(AH, oid);
 
-                       while ((cnt = tarRead(buf, 4095, th)) > 0)
-                       {
-                               buf[cnt] = '\0';
-                               ahwrite(buf, 1, cnt, AH);
+                               while ((cnt = tarRead(buf, 4095, th)) > 0)
+                               {
+                                       buf[cnt] = '\0';
+                                       ahwrite(buf, 1, cnt, AH);
+                               }
+                               EndRestoreBlob(AH, oid);
                        }
-                       EndRestoreBlob(AH, oid);
                }
 
                tarClose(AH, th);
@@ -916,9 +890,9 @@ _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid)
        else
                sfx = "";
 
-       sprintf(fname, "blob_%d.dat%s", oid, sfx);
+       sprintf(fname, "blob_%u.dat%s", oid, sfx);
 
-       tarPrintf(AH, ctx->blobToc, "%d %s\n", oid, fname);
+       tarPrintf(AH, ctx->blobToc, "%u %s\n", oid, fname);
 
        tctx->TH = tarOpen(AH, fname, 'w');