WIP. TODO: parse pgpro_remoteversion_str

alubennikova · alubennikova · commit a42fff08a38f · 2017-07-07T18:21:02.000+03:00
diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
@@ -174,6 +174,7 @@ 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 */
 	bool		isStandby;		/* is server a standby node */
 
 	int			minRemoteVersion;		/* allowable range */
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
@@ -33,6 +33,31 @@ 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_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
 _check_database_version(ArchiveHandle *AH)
@@ -47,6 +72,7 @@ _check_database_version(ArchiveHandle *AH)
 		exit_horribly(modulename, "could not get server_version from libpq\n");
 
 	/* TODO select pgpro_version, pgpro_edition */
+	get_pgpro_version(AH);
 
 	AH->public.remoteVersionStr = pg_strdup(remoteversion_str);
 	AH->public.remoteVersion = remoteversion;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -6281,7 +6281,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 		 */
 		resetPQExpBuffer(query);
 		/* TODO check pgpro_version instead of just remoteVersion */
-		if (fout->remoteVersion >= 90600)
+		if (fout->remoteVersion >= 90600 && fout->pgproremoteVersion > 0)
 		{
 			/*
 			 * In 9.6 we add INCLUDING columns functionality

Original file line number	Diff line number	Diff line change
`@@ -6281,7 +6281,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)`
`6281`	`6281`	`*/`
`6282`	`6282`	`resetPQExpBuffer(query);`
`6283`	`6283`	`/* TODO check pgpro_version instead of just remoteVersion */`
`6284`		`- if (fout->remoteVersion >= 90600)`
	`6284`	`+ if (fout->remoteVersion >= 90600 && fout->pgproremoteVersion > 0)`
`6285`	`6285`	`{`
`6286`	`6286`	`/*`
`6287`	`6287`	`* In 9.6 we add INCLUDING columns functionality`