Add pg_dump --binary-upgrade flag to be used by binary upgrade

utilities.

The new code allows transfer of dropped column information to the
upgraded server.

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 9cbff3c7107732029fcad5b332910bb968a5b707..82831075472a939dca53ecdf3da9ab26ceee836b 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -827,6 +827,11 @@ CREATE DATABASE foo WITH TEMPLATE template0;
    editing of the dump file might be required.
   </para>
 
+  <para>
+   <application>pg_dump</application> also supports a
+   <literal>--binary-upgrade</> option for upgrade utility usage.
+  </para>
+
  </refsect1>
 
  <refsect1 id="pg-dump-examples">

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index ea7a541bc8fefcd9491210801679c8ce5a2701d4..0a781ac88a4bddeb16d2717be0f9ae4dd185afa7 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -489,6 +489,11 @@ PostgreSQL documentation
    locations.
   </para>
 
+  <para>
+   <application>pg_dump</application> also supports a
+   <literal>--binary-upgrade</> option for upgrade utility usage.
+  </para>
+
  </refsect1>
 
 

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 555eca8892cb9d49532648a93db5bc80c86a45aa..c15fa3f08acee0299e139475b3e3017ebf34ae53 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -99,6 +99,8 @@ static SimpleOidList table_exclude_oids = {NULL, NULL};
 /* default, if no "inclusion" switches appear, is to dump everything */
 static bool include_everything = true;
 
+static int     binary_upgrade = 0;
+
 char           g_opaque_type[10];      /* name for the opaque type */
 
 /* placeholders for the delimiters for comments */
@@ -236,7 +238,8 @@ main(int argc, char **argv)
        static int  outputNoTablespaces = 0;
        static int      use_setsessauth = 0;
 
-       static struct option long_options[] = {
+       struct option long_options[] = {
+               {"binary-upgrade", no_argument, &binary_upgrade, 1},    /* not documented */
                {"data-only", no_argument, NULL, 'a'},
                {"blobs", no_argument, NULL, 'b'},
                {"clean", no_argument, NULL, 'c'},
@@ -4611,6 +4614,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
        int                     i_attnotnull;
        int                     i_atthasdef;
        int                     i_attisdropped;
+       int                     i_attlen;
+       int                     i_attalign;
        int                     i_attislocal;
        PGresult   *res;
        int                     ntups;
@@ -4655,7 +4660,7 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
                        appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, "
                                                                 "a.attstattarget, a.attstorage, t.typstorage, "
                                                                 "a.attnotnull, a.atthasdef, a.attisdropped, "
-                                                                "a.attislocal, "
+                                                                "a.attlen, a.attalign, a.attislocal, "
                                   "pg_catalog.format_type(t.oid,a.atttypmod) AS atttypname "
                         "FROM pg_catalog.pg_attribute a LEFT JOIN pg_catalog.pg_type t "
                                                          "ON a.atttypid = t.oid "
@@ -4674,7 +4679,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
                        appendPQExpBuffer(q, "SELECT a.attnum, a.attname, "
                                                          "a.atttypmod, -1 AS attstattarget, a.attstorage, "
                                                          "t.typstorage, a.attnotnull, a.atthasdef, "
-                                                         "false AS attisdropped, false AS attislocal, "
+                                                         "false AS attisdropped, 0 AS attlen, "
+                                                         "' ' AS attalign, false AS attislocal, "
                                                          "format_type(t.oid,a.atttypmod) AS atttypname "
                                                          "FROM pg_attribute a LEFT JOIN pg_type t "
                                                          "ON a.atttypid = t.oid "
@@ -4690,7 +4696,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
                                                          "-1 AS attstattarget, attstorage, "
                                                          "attstorage AS typstorage, "
                                                          "attnotnull, atthasdef, false AS attisdropped, "
-                                                         "false AS attislocal, "
+                                                         "0 AS attlen, ' ' AS attalign, "
+                                                         "false AS attislocal, "
                                                          "(SELECT typname FROM pg_type WHERE oid = atttypid) AS atttypname "
                                                          "FROM pg_attribute a "
                                                          "WHERE attrelid = '%u'::oid "
@@ -4714,6 +4721,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
                i_attnotnull = PQfnumber(res, "attnotnull");
                i_atthasdef = PQfnumber(res, "atthasdef");
                i_attisdropped = PQfnumber(res, "attisdropped");
+               i_attlen = PQfnumber(res, "attlen");
+               i_attalign = PQfnumber(res, "attalign");
                i_attislocal = PQfnumber(res, "attislocal");
 
                tbinfo->numatts = ntups;
@@ -4724,6 +4733,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
                tbinfo->attstorage = (char *) malloc(ntups * sizeof(char));
                tbinfo->typstorage = (char *) malloc(ntups * sizeof(char));
                tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool));
+               tbinfo->attlen = (int *) malloc(ntups * sizeof(int));
+               tbinfo->attalign = (char *) malloc(ntups * sizeof(char));
                tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
                tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
                tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
@@ -4747,6 +4758,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
                        tbinfo->attstorage[j] = *(PQgetvalue(res, j, i_attstorage));
                        tbinfo->typstorage[j] = *(PQgetvalue(res, j, i_typstorage));
                        tbinfo->attisdropped[j] = (PQgetvalue(res, j, i_attisdropped)[0] == 't');
+                       tbinfo->attlen[j] = atoi(PQgetvalue(res, j, i_attlen));
+                       tbinfo->attalign[j] = *(PQgetvalue(res, j, i_attalign));
                        tbinfo->attislocal[j] = (PQgetvalue(res, j, i_attislocal)[0] == 't');
                        tbinfo->notnull[j] = (PQgetvalue(res, j, i_attnotnull)[0] == 't');
                        tbinfo->attrdefs[j] = NULL; /* fix below */
@@ -4760,6 +4773,21 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 
                PQclear(res);
 
+
+               /*
+                *      ALTER TABLE DROP COLUMN clears pg_attribute.atttypid, so we
+                *      set the column data type to 'TEXT;  we will later drop the
+                *      column.
+                */
+               if (binary_upgrade)
+               {
+                       for (j = 0; j < ntups; j++)
+                       {
+                               if (tbinfo->attisdropped[j])
+                                       tbinfo->atttypnames[j] = strdup("TEXT");
+                       }
+               }
+                       
                /*
                 * Get info about column defaults
                 */
@@ -9680,7 +9708,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
                for (j = 0; j < tbinfo->numatts; j++)
                {
                        /* Is this one of the table's own attrs, and not dropped ? */
-                       if (!tbinfo->inhAttrs[j] && !tbinfo->attisdropped[j])
+                       if (!tbinfo->inhAttrs[j] &&
+                               (!tbinfo->attisdropped[j] || binary_upgrade))
                        {
                                /* Format properly if not first attr */
                                if (actual_atts > 0)
@@ -9786,6 +9815,53 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
                appendPQExpBuffer(q, ";\n");
 
+               /*
+                * For binary-compatible heap files, we create dropped columns
+                * above and drop them here.
+                */
+               if (binary_upgrade)
+               {
+                       for (j = 0; j < tbinfo->numatts; j++)
+                       {
+                               if (tbinfo->attisdropped[j])
+                               {
+                                       appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
+                                                                         fmtId(tbinfo->dobj.name));
+                                       appendPQExpBuffer(q, "DROP COLUMN %s;\n",
+                                                                         fmtId(tbinfo->attnames[j]));
+
+                                       /*
+                                        *      ALTER TABLE DROP COLUMN clears pg_attribute.atttypid,
+                                        *      so we have to set pg_attribute.attlen and
+                                        *      pg_attribute.attalign values because that is what
+                                        *      is used to skip over dropped columns in the heap tuples.
+                                        *      We have atttypmod, but it seems impossible to know the
+                                        *      correct data type that will yield pg_attribute values
+                                        *      that match the old installation.
+                                        *      See comment in backend/catalog/heap.c::RemoveAttributeById()
+                                        */
+                                       appendPQExpBuffer(q, "\n-- For binary upgrade, recreate dropped column's length and alignment.\n");
+                                       appendPQExpBuffer(q, "UPDATE pg_attribute\n"
+                                                                                "SET attlen = %d, "
+                                                                                "attalign = '%c'\n"
+                                                                                "WHERE attname = '%s'\n"
+                                                                                "      AND attrelid = \n"
+                                                                                "      (\n"
+                                                                                "              SELECT oid\n"
+                                                                                "              FROM pg_class\n"
+                                                                                "              WHERE   relnamespace = "
+                                                                                "(SELECT oid FROM pg_namespace "
+                                                                                "WHERE nspname = CURRENT_SCHEMA)\n"
+                                                                                "                      AND relname = '%s'\n"
+                                                                                "      );",
+                                                                                tbinfo->attlen[j],
+                                                                                tbinfo->attalign[j],
+                                                                                tbinfo->attnames[j],
+                                                                                tbinfo->dobj.name);
+                               }
+                       }
+               }
+       
                /* Loop dumping statistics and storage statements */
                for (j = 0; j < tbinfo->numatts; j++)
                {

diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index 3ca376476078251c5f1cc6905756e1c375f65af1..8869a5146a659c937d8ece16dde07d9616aa5d83 100644 (file)
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -245,6 +245,8 @@ typedef struct _tableInfo
        char       *attstorage;         /* attribute storage scheme */
        char       *typstorage;         /* type storage scheme */
        bool       *attisdropped;       /* true if attr is dropped; don't dump it */
+       int                *attlen;                     /* attribute length, used by binary_upgrade */
+       char       *attalign;           /* attribute align, used by binary_upgrade */
        bool       *attislocal;         /* true if attr has local definition */
 
        /*

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 845a1b11502a3e50c0c48143c63b279cec4b16c6..55d15e9e18334bb7b78177ba26f3fa1badaa8f4d 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -90,8 +90,10 @@ main(int argc, char *argv[])
        const char *std_strings;
        int                     c,
                                ret;
+       int                     binary_upgrade = 0;
 
-       static struct option long_options[] = {
+       struct option long_options[] = {
+               {"binary-upgrade", no_argument, &binary_upgrade, 1},    /* not documented */
                {"data-only", no_argument, NULL, 'a'},
                {"clean", no_argument, NULL, 'c'},
                {"inserts", no_argument, NULL, 'd'},
@@ -310,6 +312,8 @@ main(int argc, char *argv[])
        }
 
        /* Add long options to the pg_dump argument list */
+       if (binary_upgrade)
+               appendPQExpBuffer(pgdumpopts, " --binary-upgrade");
        if (disable_dollar_quoting)
                appendPQExpBuffer(pgdumpopts, " --disable-dollar-quoting");
        if (disable_triggers)