- Get view OID based on rule OID not base table OID

- Fix crash due to null string pointer in some tar files with some libs

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index dbbeed5cd3e90f950d8ff9969a802d29086deff5..84dc5c28a0444cde70412895074671ce8677d605 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -73,7 +73,7 @@ static int    _tocSortCompareByOIDNum(const void *p1, const void *p2);
 static int     _tocSortCompareByIDNum(const void *p1, const void *p2);
 static ArchiveHandle *_allocAH(const char *FileSpec, const ArchiveFormat fmt,
                 const int compression, ArchiveMode mode);
-static int     _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt);
+static int     _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isData);
 
 static void _reconnectAsOwner(ArchiveHandle *AH, const char *dbname, TocEntry *te);
 static void _reconnectAsUser(ArchiveHandle *AH, const char *dbname, char *user);
@@ -266,7 +266,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
                        _reconnectAsOwner(AH, "-", te);
 
                        ahlog(AH, 1, "Creating %s %s\n", te->desc, te->name);
-                       _printTocEntry(AH, te, ropt);
+                       _printTocEntry(AH, te, ropt, false);
 
                        /* If we created a DB, connect to it... */
                        if (strcmp(te->desc, "DATABASE") == 0)
@@ -286,8 +286,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
                                die_horribly(AH, "%s: Unable to restore data from a compressed archive\n", progname);
 #endif
 
-                       ahprintf(AH, "--\n-- Data for TOC Entry ID %d (OID %s) %s %s\n--\n\n",
-                                        te->id, te->oid, te->desc, te->name);
+                       _printTocEntry(AH, te, ropt, true);
 
                        /*
                         * Maybe we can't do BLOBS, so check if this node is for BLOBS
@@ -1869,10 +1868,19 @@ _reconnectAsOwner(ArchiveHandle *AH, const char *dbname, TocEntry *te)
 }
 
 static int
-_printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt)
+_printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isData)
 {
-       ahprintf(AH, "--\n-- TOC Entry ID %d (OID %s)\n--\n-- Name: %s Type: %s Owner: %s\n",
-                        te->id, te->oid, te->name, te->desc, te->owner);
+       char    *pfx;
+
+       if (isData)
+       {
+               pfx = "Data for ";
+       } else {
+               pfx = "";
+       }
+
+       ahprintf(AH, "--\n-- %sTOC Entry ID %d (OID %s)\n--\n-- Name: %s Type: %s Owner: %s\n",
+                        pfx, te->id, te->oid, te->name, te->desc, te->owner);
        if (AH->PrintExtraTocPtr !=NULL)
                (*AH->PrintExtraTocPtr) (AH, te);
        ahprintf(AH, "--\n\n");

diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index 83f632e69710e13d51db4ac581f1b3339ec8cec1..49a1f6c90d9c00a82c96cc335df06d5017e29ac7 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -68,7 +68,7 @@ typedef z_stream *z_streamp;
 
 #define K_VERS_MAJOR 1
 #define K_VERS_MINOR 5
-#define K_VERS_REV 2 
+#define K_VERS_REV 3 
 
 /* Data block types */
 #define BLK_DATA 1

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index aebda8f89b5f9fa5ca5831fd5eda5186da1d9dec..3e598bd90e9af9eaa890fad28c10a9a8e8e22da2 100644 (file)
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -246,7 +246,7 @@ _ArchiveEntry(ArchiveHandle *AH, TocEntry *te)
        char            fn[K_STD_BUF_SIZE];
 
        ctx = (lclTocEntry *) malloc(sizeof(lclTocEntry));
-       if (te->dataDumper)
+       if (te->dataDumper != NULL)
        {
 #ifdef HAVE_LIBZ
                if (AH->compression == 0)
@@ -302,7 +302,8 @@ _PrintExtraToc(ArchiveHandle *AH, TocEntry *te)
 {
        lclTocEntry *ctx = (lclTocEntry *) te->formatData;
 
-       ahprintf(AH, "-- File: %s\n", ctx->filename);
+       if (ctx->filename != NULL)
+               ahprintf(AH, "-- File: %s\n", ctx->filename);
 }
 
 static void

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index a6a29d090b4f224f8ff5c77ff051a446aaf0c0b3..12fffea65c88df722a24fbcd3587ff02b7b77469 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -2035,9 +2035,14 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
                        PGresult   *res2;
 
                        resetPQExpBuffer(query);
-                       appendPQExpBuffer(query, "SELECT pg_get_viewdef(");
+                       appendPQExpBuffer(query, "SELECT definition as viewdef, ");
+                       /* XXX 7.2 - replace with att from pg_views or some other generic source */
+                       appendPQExpBuffer(query, "(select oid from pg_rewrite where rulename='_RET'"
+                                                                               " || viewname) as view_oid from pg_views"
+                                                                               " where viewname = ");
                        formatStringLiteral(query, tblinfo[i].relname, CONV_ALL);
-                       appendPQExpBuffer(query, ") as viewdef");
+                       appendPQExpBuffer(query, ";");
+
                        res2 = PQexec(g_conn, query->data);
                        if (!res2 || PQresultStatus(res2) != PGRES_TUPLES_OK)
                        {
@@ -2051,18 +2056,26 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
                        {
                                if (PQntuples(res2) < 1)
                                {
-                                       fprintf(stderr, "getTables(): SELECT (for VIEW %s) returned no definitions",
+                                       fprintf(stderr, "getTables(): SELECT (for VIEW %s) returned no definitions\n",
                                                        tblinfo[i].relname);
                                }
                                else
                                {
-                                       fprintf(stderr, "getTables(): SELECT (for VIEW %s) returned more than 1 definition",
+                                       fprintf(stderr, "getTables(): SELECT (for VIEW %s) returned more than 1 definition\n",
                                                        tblinfo[i].relname);
                                }
                                exit_nicely(g_conn);
                        }
 
+                       if (PQgetisnull(res2, 0, 1))
+                       {
+                               fprintf(stderr, "getTables(): SELECT (for VIEW %s) returned NULL oid\n", tblinfo[i].relname);
+                               fprintf(stderr, "SELECT was: %s\n", query->data);
+                               exit_nicely(g_conn);
+                       }
+
                        tblinfo[i].viewdef = strdup(PQgetvalue(res2, 0, 0));
+                       tblinfo[i].viewoid = strdup(PQgetvalue(res2, 0, 1));
 
                        if (strlen(tblinfo[i].viewdef) == 0)
                        {
@@ -3739,6 +3752,7 @@ dumpTables(Archive *fout, TableInfo *tblinfo, int numTables,
        int                     numParents;
        int                     actual_atts;    /* number of attrs in this CREATE statment */
        char       *reltypename;
+       char       *objoid;
 
        /* First - dump SEQUENCEs */
        if (tablename && strlen(tablename) > 0)
@@ -3778,15 +3792,15 @@ dumpTables(Archive *fout, TableInfo *tblinfo, int numTables,
                        if (tblinfo[i].viewdef != NULL)
                        {
                                reltypename = "VIEW";
-
+                               objoid = tblinfo[i].viewoid;
                                appendPQExpBuffer(delq, "DROP VIEW %s;\n", fmtId(tblinfo[i].relname, force_quotes));
-                               appendPQExpBuffer(q, "CREATE VIEW %s as %s", fmtId(tblinfo[i].relname, force_quotes), tblinfo[i].viewdef);
+                               appendPQExpBuffer(q, "CREATE VIEW %s as %s\n", fmtId(tblinfo[i].relname, force_quotes), tblinfo[i].viewdef);
 
                        }
                        else
                        {
                                reltypename = "TABLE";
-
+                               objoid = tblinfo[i].oid;
                                parentRels = tblinfo[i].parentRels;
                                numParents = tblinfo[i].numParents;
 
@@ -3883,7 +3897,7 @@ dumpTables(Archive *fout, TableInfo *tblinfo, int numTables,
                        if (!dataOnly)
                        {
 
-                               ArchiveEntry(fout, tblinfo[i].oid, tblinfo[i].relname,
+                               ArchiveEntry(fout, objoid, tblinfo[i].relname,
                                                         reltypename, NULL, q->data, delq->data, "", tblinfo[i].usename,
                                                         NULL, NULL);
 
@@ -4323,7 +4337,7 @@ findLastBuiltinOid(const char *dbname)
        if (res == NULL ||
                PQresultStatus(res) != PGRES_TUPLES_OK)
        {
-               fprintf(stderr, "pg_dump: error in finding the last system OID");
+               fprintf(stderr, "pg_dump: error in finding the last system OID. ");
                fprintf(stderr, "Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));
                exit_nicely(g_conn);
        }

diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index a1d960a21f8b73fb4c8390dd6008016532264dea..c93db5a2643a90f5d465402a453e2b778282207d 100644 (file)
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -88,6 +88,11 @@ typedef struct _tableInfo
        char       *relname;
        char       *relacl;
        char       *viewdef;
+       char       *viewoid;            /* OID of view - should be >= oid of table
+                                                                * important because views may be constructed 
+                                                                * manually from rules, and rule may ref things
+                                                                * created after the base table was created. 
+                                                                */
        bool            sequence;
        int                     numatts;                /* number of attributes */
        int                *inhAttrs;           /* an array of flags, one for each