Merge pull request #26 from dutow/verfix

dutow · web-flow · commit 7b496412ac35 · 2024-12-16T07:26:11.000Z
PG-1235: Fix product name and version
diff --git a/contrib/oid2name/oid2name.c b/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);
 		}
 	}
diff --git a/contrib/vacuumlo/vacuumlo.c b/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);
 		}
 	}
diff --git a/meson.build b/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())
diff --git a/src/bin/initdb/initdb.c b/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);
 		}
 	}
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/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);
 		}
 	}
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/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);
 		}
 	}
diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/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);
 		}
 	}
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/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);
 		}
 	}
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/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);
 		}
 	}
diff --git a/src/bin/pg_checksums/pg_checksums.c b/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);
 		}
 	}
diff --git a/src/bin/pg_controldata/pg_controldata.c b/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);
 		}
 	}
diff --git a/src/bin/pg_ctl/pg_ctl.c b/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);
 		}
 	}
diff --git a/src/bin/pg_dump/pg_dump.c b/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);
 		}
 	}
diff --git a/src/bin/pg_dump/pg_dumpall.c b/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);
 		}
 	}
diff --git a/src/bin/pg_dump/pg_restore.c b/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);
 		}
 	}
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/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);
 		}
 	}
diff --git a/src/bin/pg_rewind/pg_rewind.c b/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);
 		}
 	}
diff --git a/src/bin/pg_test_fsync/pg_test_fsync.c b/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);
 		}
 	}
diff --git a/src/bin/pg_test_timing/pg_test_timing.c b/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);
 		}
 	}
diff --git a/src/bin/pg_upgrade/exec.c b/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\"",
diff --git a/src/bin/pg_upgrade/option.c b/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);
 		}
 	}
diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/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)
 		{
diff --git a/src/bin/pg_waldump/pg_waldump.c b/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);
 		}
 	}
diff --git a/src/bin/pgbench/pgbench.c b/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);
 		}
 	}
diff --git a/src/bin/psql/startup.c b/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);
 }
 
 
diff --git a/src/fe_utils/option_utils.c b/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);
 		}
 	}
diff --git a/src/include/port.h b/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) */
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/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);
 		}
 	}
diff --git a/src/test/isolation/isolation_main.c b/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
diff --git a/src/test/isolation/isolationtester.c b/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");
diff --git a/src/test/regress/pg_regress.c b/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:
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ get_opts(int argc, char *argv, struct options my_opts)`
`110`	`110`	`}`
`111`	`111`	`if (strcmp(argv[1], "--version") == 0 \|\| strcmp(argv[1], "-V") == 0)`
`112`	`112`	`{`
`113`		`- puts("oid2name (Percona Server for PostgreSQL) " PG_VERSION);`
	`113`	`+ puts("oid2name (PostgreSQL) " PG_VERSION);`
`114`	`114`	`exit(0);`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ main(int argc, char **argv)`
`480`	`480`	`}`
`481`	`481`	`if (strcmp(argv[1], "--version") == 0 \|\| strcmp(argv[1], "-V") == 0)`
`482`	`482`	`{`
`483`		`- puts("vacuumlo (Percona Server for PostgreSQL) " PG_VERSION);`
	`483`	`+ puts("vacuumlo (PostgreSQL) " PG_VERSION);`
`484`	`484`	`exit(0);`
`485`	`485`	`}`
`486`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3215,7 +3215,7 @@ main(int argc, char *argv[])`
`3215`	`3215`	`}`
`3216`	`3216`	`if (strcmp(argv[1], "--version") == 0 \|\| strcmp(argv[1], "-V") == 0)`
`3217`	`3217`	`{`
`3218`		`- puts("initdb (Percona Server for PostgreSQL) " PG_VERSION);`
	`3218`	`+ puts("initdb (PostgreSQL) " PG_VERSION);`
`3219`	`3219`	`exit(0);`
`3220`	`3220`	`}`
`3221`	`3221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ main(int argc, char **argv)`
`307`	`307`	`}`
`308`	`308`	`if (strcmp(argv[1], "--version") == 0 \|\| strcmp(argv[1], "-V") == 0)`
`309`	`309`	`{`
`310`		`- puts("pg_archivecleanup (Percona Server for PostgreSQL) " PG_VERSION);`
	`310`	`+ puts("pg_archivecleanup (PostgreSQL) " PG_VERSION);`
`311`	`311`	`exit(0);`
`312`	`312`	`}`
`313`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2415,7 +2415,7 @@ main(int argc, char **argv)`
`2415`	`2415`	`else if (strcmp(argv[1], "-V") == 0`
`2416`	`2416`	`\|\| strcmp(argv[1], "--version") == 0)`
`2417`	`2417`	`{`
`2418`		`- puts("pg_basebackup (Percona Server for PostgreSQL) " PG_VERSION);`
	`2418`	`+ puts("pg_basebackup (PostgreSQL) " PG_VERSION);`
`2419`	`2419`	`exit(0);`
`2420`	`2420`	`}`
`2421`	`2421`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ get_exec_path(const char argv0, const char progname)`
`344`	`344`	`char *exec_path;`
`345`	`345`	`int ret;`
`346`	`346`
`347`		`- versionstr = psprintf("%s (Percona Server for PostgreSQL) %s\n", progname, PG_VERSION);`
	`347`	`+ versionstr = psprintf("%s (PostgreSQL) %s\n", progname, PG_VERSION);`
`348`	`348`	`exec_path = pg_malloc(MAXPGPATH);`
`349`	`349`	`ret = find_other_exec(argv0, progname, versionstr, exec_path);`
`350`	`350`
`@@ -1916,7 +1916,7 @@ main(int argc, char **argv)`
`1916`	`1916`	`else if (strcmp(argv[1], "-V") == 0`
`1917`	`1917`	`\|\| strcmp(argv[1], "--version") == 0)`
`1918`	`1918`	`{`
`1919`		`- puts("pg_createsubscriber (Percona Server for PostgreSQL) " PG_VERSION);`
	`1919`	`+ puts("pg_createsubscriber (PostgreSQL) " PG_VERSION);`
`1920`	`1920`	`exit(0);`
`1921`	`1921`	`}`
`1922`	`1922`	`}`
Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ main(int argc, char **argv)`
`672`	`672`	`else if (strcmp(argv[1], "-V") == 0 \|\|`
`673`	`673`	`strcmp(argv[1], "--version") == 0)`
`674`	`674`	`{`
`675`		`- puts("pg_receivewal (Percona Server for PostgreSQL) " PG_VERSION);`
	`675`	`+ puts("pg_receivewal (PostgreSQL) " PG_VERSION);`
`676`	`676`	`exit(0);`
`677`	`677`	`}`
`678`	`678`	`}`
Original file line number	Diff line number	Diff line change
`@@ -741,7 +741,7 @@ main(int argc, char **argv)`
`741`	`741`	`else if (strcmp(argv[1], "-V") == 0 \|\|`
`742`	`742`	`strcmp(argv[1], "--version") == 0)`
`743`	`743`	`{`
`744`		`- puts("pg_recvlogical (Percona Server for PostgreSQL) " PG_VERSION);`
	`744`	`+ puts("pg_recvlogical (PostgreSQL) " PG_VERSION);`
`745`	`745`	`exit(0);`
`746`	`746`	`}`
`747`	`747`	`}`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ main(int argc, char *argv[])`
`464`	`464`	`}`
`465`	`465`	`if (strcmp(argv[1], "--version") == 0 \|\| strcmp(argv[1], "-V") == 0)`
`466`	`466`	`{`
`467`		`- puts("pg_checksums (Percona Server for PostgreSQL) " PG_VERSION);`
	`467`	`+ puts("pg_checksums (PostgreSQL) " PG_VERSION);`
`468`	`468`	`exit(0);`
`469`	`469`	`}`
`470`	`470`	`}`