Merge branch 'PGPRO9_6_pg_upgrade_fixes' into PGPRO9_6

Author: vbwagner

src/bin/pg_dump/pg_backup.h

@@ -162,6 +162,14 @@ typedef struct _dumpOptions
 	char	   *outputSuperuser;
 } DumpOptions;
 
+typedef enum _pgproEdition
+{
+	NONE,
+	STANDART,
+	STANDART_CERTIFIED,
+	ENTERPRISE,
+} pgproEdition;
+
 /*
  *	We may want to have some more user-readable data, but in the mean
  *	time this gives us some abstraction and type checking.
@@ -174,6 +182,8 @@ typedef struct Archive
 	int			verbose;
 	char	   *remoteVersionStr;		/* server's version string */
 	int			remoteVersion;	/* same in numeric form */
+	int			pgproremoteVersion;	/* pgpro server's version in numeric form */
+	pgproEdition pgproremoteEdition; /* pgpro server's edition. */
 	bool		isStandby;		/* is server a standby node */
 
 	int			minRemoteVersion;		/* allowable range */

src/bin/pg_dump/pg_backup_db.c

@@ -33,6 +33,74 @@ static const char *modulename = gettext_noop("archiver (db)");
 static void _check_database_version(ArchiveHandle *AH);
 static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
 static void notice_processor(void *arg, const char *message);
+static void get_pgpro_version(ArchiveHandle *AH);
+static void get_pgpro_edition(ArchiveHandle *AH);
+
+static void
+get_pgpro_version(ArchiveHandle *AH)
+{
+	char	   *query = "SELECT pgpro_version()";
+	PGresult   *res;
+	const char *pgpro_remoteversion_str;
+
+	res = PQexec(AH->connection, query);
+	/* If the query failed, it means that remote cluster is not PgPro. */
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		AH->public.pgproremoteVersion = 0;
+		fprintf(stdout, "pgpro server version: 0; %s version: %s\n", progname, PG_VERSION);
+	}
+	else
+	{
+		pgpro_remoteversion_str = pg_strdup(PQgetvalue(res, 0, 0));
+		AH->public.pgproremoteVersion = 1;
+		fprintf(stdout, "pgpro server version: %s; %s version: %s\n",
+				  pgpro_remoteversion_str, progname, PG_VERSION);
+	}
+	PQclear(res);
+}
+
+static void
+get_pgpro_edition(ArchiveHandle *AH)
+{
+	char	   *query = "SELECT pgpro_edition()";
+	PGresult   *res;
+	const char *pgpro_remoteEdition_str;
+
+	res = PQexec(AH->connection, query);
+	/* If the query failed, it means that remote cluster is not PgPro. */
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		AH->public.pgproremoteEdition = NONE;
+		fprintf(stdout, "pgpro server edition: 0; %s version: %s\n", progname, PG_VERSION);
+	}
+	else
+	{
+		pgpro_remoteEdition_str = pg_strdup(PQgetvalue(res, 0, 0));
+
+		fprintf(stdout, "pgpro server edition: %s; %s version: %s\n",
+				  pgpro_remoteEdition_str, progname, PG_VERSION);
+
+		if (strcmp(pgpro_remoteEdition_str, "standard") == 0)
+			AH->public.pgproremoteEdition = STANDART;
+		else if (strcmp(pgpro_remoteEdition_str, "standard-certified") == 0)
+			AH->public.pgproremoteEdition = STANDART_CERTIFIED;
+		else if (strcmp(pgpro_remoteEdition_str, "enterprise") == 0)
+		{
+			AH->public.pgproremoteEdition = ENTERPRISE;
+			if (AH->public.remoteVersion >= 90600)
+				exit_horribly(NULL, "pg_upgrade for 64bit-xid is not implemented yet"
+									"Use pg_dump/pg_restore instead.\n");
+		}
+		else
+		{
+			write_msg(NULL, "Unrecognized pgpro edition: %s\n",
+					  pgpro_remoteEdition_str);
+			exit_horribly(NULL, "aborting because of unrecognized pgpro edition\n");
+		}
+	}
+	PQclear(res);
+}
 
 static void
 _check_database_version(ArchiveHandle *AH)
@@ -60,6 +128,9 @@ _check_database_version(ArchiveHandle *AH)
 		exit_horribly(NULL, "aborting because of server version mismatch\n");
 	}
 
+	get_pgpro_version(AH);
+	get_pgpro_edition(AH);
+
 	/*
 	 * When running against 9.0 or later, check if we are in recovery mode,
 	 * which means we are on a hot standby.

src/bin/pg_dump/pg_dump.c

@@ -6285,10 +6285,10 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 		 * is not.
 		 */
 		resetPQExpBuffer(query);
-		if (fout->remoteVersion >= 90600)
+		if (fout->remoteVersion >= 90600 && fout->pgproremoteVersion > 0)
 		{
 			/*
-			 * In 9.6 we add INCLUDING columns functionality
+			 * In PGPRO9_6 we add INCLUDING columns functionality
 			 * that requires new fields to be added.
 			 * i.indnkeyattrs is new, and besides we should use
 			 * i.indnatts instead of t.relnatts for index relations.

src/include/catalog/catversion.h

@@ -50,9 +50,10 @@
  * YYYYMMDD are the date of the change, and N is the number of the change
  * on that day.  (Hopefully we'll never commit ten independent sets of
  * catalog changes on the same day...)
+ * For PGPRO we added also P - the number of the PGPRO specific catalog change.
  */
 
-/*							yyyymmddN */
-#define CATALOG_VERSION_NO	201608131
+/*							yyyymmddNP */
+#define CATALOG_VERSION_NO	2016081311
 
 #endif