PG-1235: Fix product name and version

Issue: pg_upgrade and some other tests are failing

This is caused by some mistake during the 17.2 rebase, where the commits
that fixed this issue previously, by changing the version and product name,
simply disappeared.

Fix: reintroduce the same changes, with this, the format of the name / version
is the same as for 17.0

contrib/oid2name/oid2name.c

@@ -110,7 +110,7 @@ get_opts(int argc, char **argv, struct options *my_opts)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("oid2name (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("oid2name (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

contrib/vacuumlo/vacuumlo.c

@@ -480,7 +480,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("vacuumlo (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("vacuumlo (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

meson.build

@@ -145,7 +145,7 @@ cdata.set_quoted('PACKAGE_VERSION', pg_version)
 cdata.set_quoted('PACKAGE_STRING', 'PostgreSQL @0@'.format(pg_version))
 cdata.set_quoted('PACKAGE_TARNAME', 'postgresql')
 
-pg_version += ' - Percona Server for PostgreSQL' + pg_version_major.to_string() + '.' + pg_version_minor.to_string() + '.' + pg_percona_ver
+pg_version += ' - PostgreSQL ' + pg_version_major.to_string() + '.' + pg_version_minor.to_string() + '.' + pg_percona_ver
 pg_version += get_option('extra_version')
 cdata.set_quoted('PG_VERSION', pg_version)
 cdata.set_quoted('PG_MAJORVERSION', pg_version_major.to_string())

src/bin/initdb/initdb.c

@@ -3215,7 +3215,7 @@ main(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("initdb (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("initdb (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_archivecleanup/pg_archivecleanup.c

@@ -307,7 +307,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_archivecleanup (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_archivecleanup (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_basebackup/pg_basebackup.c

@@ -2415,7 +2415,7 @@ main(int argc, char **argv)
 		else if (strcmp(argv[1], "-V") == 0
 				 || strcmp(argv[1], "--version") == 0)
 		{
-			puts("pg_basebackup (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_basebackup (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_basebackup/pg_createsubscriber.c

@@ -344,7 +344,7 @@ get_exec_path(const char *argv0, const char *progname)
 	char	   *exec_path;
 	int			ret;
 
-	versionstr = psprintf("%s (Percona Server for PostgreSQL) %s\n", progname, PG_VERSION);
+	versionstr = psprintf("%s (PostgreSQL) %s\n", progname, PG_VERSION);
 	exec_path = pg_malloc(MAXPGPATH);
 	ret = find_other_exec(argv0, progname, versionstr, exec_path);
 
@@ -1916,7 +1916,7 @@ main(int argc, char **argv)
 		else if (strcmp(argv[1], "-V") == 0
 				 || strcmp(argv[1], "--version") == 0)
 		{
-			puts("pg_createsubscriber (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_createsubscriber (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_basebackup/pg_receivewal.c

@@ -672,7 +672,7 @@ main(int argc, char **argv)
 		else if (strcmp(argv[1], "-V") == 0 ||
 				 strcmp(argv[1], "--version") == 0)
 		{
-			puts("pg_receivewal (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_receivewal (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_basebackup/pg_recvlogical.c

@@ -741,7 +741,7 @@ main(int argc, char **argv)
 		else if (strcmp(argv[1], "-V") == 0 ||
 				 strcmp(argv[1], "--version") == 0)
 		{
-			puts("pg_recvlogical (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_recvlogical (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_checksums/pg_checksums.c

@@ -464,7 +464,7 @@ main(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_checksums (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_checksums (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_controldata/pg_controldata.c

@@ -120,7 +120,7 @@ main(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_controldata (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_controldata (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_ctl/pg_ctl.c

@@ -896,7 +896,7 @@ do_init(void)
 	char	   *cmd;
 
 	if (exec_path == NULL)
-		exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (Percona Server for PostgreSQL) " PG_VERSION "\n");
+		exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (PostgreSQL) " PG_VERSION "\n");
 
 	if (pgdata_opt == NULL)
 		pgdata_opt = "";
@@ -2233,7 +2233,7 @@ main(int argc, char **argv)
 		}
 		else if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_ctl (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_ctl (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_dump/pg_dump.c

@@ -474,7 +474,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_dump (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_dump (PostgreSQL) " PG_VERSION);
 			exit_nicely(0);
 		}
 	}

src/bin/pg_dump/pg_dumpall.c

@@ -31,7 +31,7 @@
 #include "pg_backup.h"
 
 /* version string we expect back from pg_dump */
-#define PGDUMP_VERSIONSTR "pg_dump (Percona Server for PostgreSQL) " PG_VERSION "\n"
+#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"
 
 typedef struct
 {
@@ -214,7 +214,7 @@ main(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_dumpall (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_dumpall (PostgreSQL) " PG_VERSION);
 			exit_nicely(0);
 		}
 	}

src/bin/pg_dump/pg_restore.c

@@ -150,7 +150,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_restore (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_restore (PostgreSQL) " PG_VERSION);
 			exit_nicely(0);
 		}
 	}

src/bin/pg_resetwal/pg_resetwal.c

@@ -132,7 +132,7 @@ main(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_resetwal (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_resetwal (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_rewind/pg_rewind.c

@@ -168,7 +168,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_rewind (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_rewind (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_test_fsync/pg_test_fsync.c

@@ -167,7 +167,7 @@ handle_args(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_test_fsync (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_test_fsync (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_test_timing/pg_test_timing.c

@@ -61,7 +61,7 @@ handle_args(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_test_timing (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_test_timing (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_upgrade/exec.c

@@ -448,7 +448,7 @@ check_exec(const char *dir, const char *program, bool check_version)
 	{
 		pg_strip_crlf(line);
 
-		snprintf(versionstr, sizeof(versionstr), "%s (Percona Server for PostgreSQL) " PG_VERSION, program);
+		snprintf(versionstr, sizeof(versionstr), "%s (PostgreSQL) " PG_VERSION, program);
 
 		if (strcmp(line, versionstr) != 0)
 			pg_fatal("check for \"%s\" failed: incorrect version: found \"%s\", expected \"%s\"",

src/bin/pg_upgrade/option.c

@@ -95,7 +95,7 @@ parseCommandLine(int argc, char *argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_upgrade (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_upgrade (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pg_verifybackup/pg_verifybackup.c

@@ -211,7 +211,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_verifybackup (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_verifybackup (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}
@@ -310,7 +310,7 @@ main(int argc, char **argv)
 
 		pg_waldump_path = pg_malloc(MAXPGPATH);
 		ret = find_other_exec(argv[0], "pg_waldump",
-							  "pg_waldump (Percona Server for PostgreSQL) " PG_VERSION "\n",
+							  "pg_waldump (PostgreSQL) " PG_VERSION "\n",
 							  pg_waldump_path);
 		if (ret < 0)
 		{

src/bin/pg_waldump/pg_waldump.c

@@ -859,7 +859,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pg_waldump (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pg_waldump (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/pgbench/pgbench.c

@@ -6723,7 +6723,7 @@ main(int argc, char **argv)
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			puts("pgbench (Percona Server for PostgreSQL) " PG_VERSION);
+			puts("pgbench (PostgreSQL) " PG_VERSION);
 			exit(0);
 		}
 	}

src/bin/psql/startup.c

@@ -838,7 +838,7 @@ process_psqlrc_file(char *filename)
 static void
 showVersion(void)
 {
-	puts("psql (Percona Server for PostgreSQL) " PG_VERSION);
+	puts("psql (PostgreSQL) " PG_VERSION);
 }
 
 

src/fe_utils/option_utils.c

@@ -33,7 +33,7 @@ handle_help_version_opts(int argc, char *argv[],
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			printf("%s (Percona Server for PostgreSQL) " PG_VERSION "\n", fixed_progname);
+			printf("%s (PostgreSQL) " PG_VERSION "\n", fixed_progname);
 			exit(0);
 		}
 	}

src/include/port.h

@@ -140,7 +140,7 @@ extern int	find_other_exec(const char *argv0, const char *target,
 extern char *pipe_read_line(char *cmd);
 
 /* Doesn't belong here, but this is used with find_other_exec(), so... */
-#define PG_BACKEND_VERSIONSTR "postgres (Percona Server for PostgreSQL) " PG_VERSION "\n"
+#define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
 
 #ifdef EXEC_BACKEND
 /* Disable ASLR before exec, for developer builds only (in exec.c) */

src/interfaces/ecpg/preproc/ecpg.c

@@ -162,7 +162,7 @@ main(int argc, char *const argv[])
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
-			printf("ecpg (Percona Server for PostgreSQL) %s\n", PG_VERSION);
+			printf("ecpg (PostgreSQL) %s\n", PG_VERSION);
 			exit(0);
 		}
 	}

src/test/isolation/isolation_main.c

@@ -19,7 +19,7 @@ char		saved_argv0[MAXPGPATH];
 char		isolation_exec[MAXPGPATH];
 bool		looked_up_isolation_exec = false;
 
-#define PG_ISOLATION_VERSIONSTR "isolationtester (Percona Server for PostgreSQL) " PG_VERSION "\n"
+#define PG_ISOLATION_VERSIONSTR "isolationtester (PostgreSQL) " PG_VERSION "\n"
 
 /*
  * start an isolation tester process for specified file (including

src/test/isolation/isolationtester.c

@@ -99,7 +99,7 @@ main(int argc, char **argv)
 		switch (opt)
 		{
 			case 'V':
-				puts("isolationtester (Percona Server for PostgreSQL) " PG_VERSION);
+				puts("isolationtester (PostgreSQL) " PG_VERSION);
 				exit(0);
 			default:
 				fprintf(stderr, "Usage: isolationtester [CONNINFO]\n");

src/test/regress/pg_regress.c

@@ -2163,7 +2163,7 @@ regression_main(int argc, char *argv[],
 				help();
 				exit(0);
 			case 'V':
-				puts("pg_regress (Percona Server for PostgreSQL) " PG_VERSION);
+				puts("pg_regress (PostgreSQL) " PG_VERSION);
 				exit(0);
 			case 1: