Skip to content

Commit 7b49641

Browse files
dutowdutow
authored
Merge pull request #26 from dutow/verfix
PG-1235: Fix product name and version
2 parents cbe9c39 + 8c9ec15 commit 7b49641

File tree

31 files changed

+35
-35
lines changed

31 files changed

+35
-35
lines changed

‎contrib/oid2name/oid2name.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ get_opts(int argc, char **argv, struct options *my_opts)
110110
}
111111
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
112112
{
113-
puts("oid2name (Percona Server for PostgreSQL) " PG_VERSION);
113+
puts("oid2name (PostgreSQL) " PG_VERSION);
114114
exit(0);
115115
}
116116
}

‎contrib/vacuumlo/vacuumlo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ main(int argc, char **argv)
480480
}
481481
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
482482
{
483-
puts("vacuumlo (Percona Server for PostgreSQL) " PG_VERSION);
483+
puts("vacuumlo (PostgreSQL) " PG_VERSION);
484484
exit(0);
485485
}
486486
}

‎meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ cdata.set_quoted('PACKAGE_VERSION', pg_version)
145145
cdata.set_quoted('PACKAGE_STRING', 'PostgreSQL @0@'.format(pg_version))
146146
cdata.set_quoted('PACKAGE_TARNAME', 'postgresql')
147147

148-
pg_version += ' - Percona Server for PostgreSQL' + pg_version_major.to_string() + '.' + pg_version_minor.to_string() + '.' + pg_percona_ver
148+
pg_version += ' - PostgreSQL ' + pg_version_major.to_string() + '.' + pg_version_minor.to_string() + '.' + pg_percona_ver
149149
pg_version += get_option('extra_version')
150150
cdata.set_quoted('PG_VERSION', pg_version)
151151
cdata.set_quoted('PG_MAJORVERSION', pg_version_major.to_string())

‎src/bin/initdb/initdb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3215,7 +3215,7 @@ main(int argc, char *argv[])
32153215
}
32163216
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
32173217
{
3218-
puts("initdb (Percona Server for PostgreSQL) " PG_VERSION);
3218+
puts("initdb (PostgreSQL) " PG_VERSION);
32193219
exit(0);
32203220
}
32213221
}

‎src/bin/pg_archivecleanup/pg_archivecleanup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ main(int argc, char **argv)
307307
}
308308
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
309309
{
310-
puts("pg_archivecleanup (Percona Server for PostgreSQL) " PG_VERSION);
310+
puts("pg_archivecleanup (PostgreSQL) " PG_VERSION);
311311
exit(0);
312312
}
313313
}

‎src/bin/pg_basebackup/pg_basebackup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2415,7 +2415,7 @@ main(int argc, char **argv)
24152415
else if (strcmp(argv[1], "-V") == 0
24162416
|| strcmp(argv[1], "--version") == 0)
24172417
{
2418-
puts("pg_basebackup (Percona Server for PostgreSQL) " PG_VERSION);
2418+
puts("pg_basebackup (PostgreSQL) " PG_VERSION);
24192419
exit(0);
24202420
}
24212421
}

‎src/bin/pg_basebackup/pg_createsubscriber.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ get_exec_path(const char *argv0, const char *progname)
344344
char *exec_path;
345345
int ret;
346346

347-
versionstr = psprintf("%s (Percona Server for PostgreSQL) %s\n", progname, PG_VERSION);
347+
versionstr = psprintf("%s (PostgreSQL) %s\n", progname, PG_VERSION);
348348
exec_path = pg_malloc(MAXPGPATH);
349349
ret = find_other_exec(argv0, progname, versionstr, exec_path);
350350

@@ -1916,7 +1916,7 @@ main(int argc, char **argv)
19161916
else if (strcmp(argv[1], "-V") == 0
19171917
|| strcmp(argv[1], "--version") == 0)
19181918
{
1919-
puts("pg_createsubscriber (Percona Server for PostgreSQL) " PG_VERSION);
1919+
puts("pg_createsubscriber (PostgreSQL) " PG_VERSION);
19201920
exit(0);
19211921
}
19221922
}

‎src/bin/pg_basebackup/pg_receivewal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ main(int argc, char **argv)
672672
else if (strcmp(argv[1], "-V") == 0 ||
673673
strcmp(argv[1], "--version") == 0)
674674
{
675-
puts("pg_receivewal (Percona Server for PostgreSQL) " PG_VERSION);
675+
puts("pg_receivewal (PostgreSQL) " PG_VERSION);
676676
exit(0);
677677
}
678678
}

‎src/bin/pg_basebackup/pg_recvlogical.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ main(int argc, char **argv)
741741
else if (strcmp(argv[1], "-V") == 0 ||
742742
strcmp(argv[1], "--version") == 0)
743743
{
744-
puts("pg_recvlogical (Percona Server for PostgreSQL) " PG_VERSION);
744+
puts("pg_recvlogical (PostgreSQL) " PG_VERSION);
745745
exit(0);
746746
}
747747
}

‎src/bin/pg_checksums/pg_checksums.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ main(int argc, char *argv[])
464464
}
465465
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
466466
{
467-
puts("pg_checksums (Percona Server for PostgreSQL) " PG_VERSION);
467+
puts("pg_checksums (PostgreSQL) " PG_VERSION);
468468
exit(0);
469469
}
470470
}

‎src/bin/pg_controldata/pg_controldata.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ main(int argc, char *argv[])
120120
}
121121
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
122122
{
123-
puts("pg_controldata (Percona Server for PostgreSQL) " PG_VERSION);
123+
puts("pg_controldata (PostgreSQL) " PG_VERSION);
124124
exit(0);
125125
}
126126
}

‎src/bin/pg_ctl/pg_ctl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ do_init(void)
896896
char *cmd;
897897

898898
if (exec_path == NULL)
899-
exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (Percona Server for PostgreSQL) " PG_VERSION "\n");
899+
exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (PostgreSQL) " PG_VERSION "\n");
900900

901901
if (pgdata_opt == NULL)
902902
pgdata_opt = "";
@@ -2233,7 +2233,7 @@ main(int argc, char **argv)
22332233
}
22342234
else if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
22352235
{
2236-
puts("pg_ctl (Percona Server for PostgreSQL) " PG_VERSION);
2236+
puts("pg_ctl (PostgreSQL) " PG_VERSION);
22372237
exit(0);
22382238
}
22392239
}

‎src/bin/pg_dump/pg_dump.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ main(int argc, char **argv)
474474
}
475475
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
476476
{
477-
puts("pg_dump (Percona Server for PostgreSQL) " PG_VERSION);
477+
puts("pg_dump (PostgreSQL) " PG_VERSION);
478478
exit_nicely(0);
479479
}
480480
}

‎src/bin/pg_dump/pg_dumpall.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "pg_backup.h"
3232

3333
/* version string we expect back from pg_dump */
34-
#define PGDUMP_VERSIONSTR "pg_dump (Percona Server for PostgreSQL) " PG_VERSION "\n"
34+
#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"
3535

3636
typedef struct
3737
{
@@ -214,7 +214,7 @@ main(int argc, char *argv[])
214214
}
215215
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
216216
{
217-
puts("pg_dumpall (Percona Server for PostgreSQL) " PG_VERSION);
217+
puts("pg_dumpall (PostgreSQL) " PG_VERSION);
218218
exit_nicely(0);
219219
}
220220
}

‎src/bin/pg_dump/pg_restore.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ main(int argc, char **argv)
150150
}
151151
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
152152
{
153-
puts("pg_restore (Percona Server for PostgreSQL) " PG_VERSION);
153+
puts("pg_restore (PostgreSQL) " PG_VERSION);
154154
exit_nicely(0);
155155
}
156156
}

‎src/bin/pg_resetwal/pg_resetwal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
132132
}
133133
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
134134
{
135-
puts("pg_resetwal (Percona Server for PostgreSQL) " PG_VERSION);
135+
puts("pg_resetwal (PostgreSQL) " PG_VERSION);
136136
exit(0);
137137
}
138138
}

‎src/bin/pg_rewind/pg_rewind.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ main(int argc, char **argv)
168168
}
169169
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
170170
{
171-
puts("pg_rewind (Percona Server for PostgreSQL) " PG_VERSION);
171+
puts("pg_rewind (PostgreSQL) " PG_VERSION);
172172
exit(0);
173173
}
174174
}

‎src/bin/pg_test_fsync/pg_test_fsync.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ handle_args(int argc, char *argv[])
167167
}
168168
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
169169
{
170-
puts("pg_test_fsync (Percona Server for PostgreSQL) " PG_VERSION);
170+
puts("pg_test_fsync (PostgreSQL) " PG_VERSION);
171171
exit(0);
172172
}
173173
}

‎src/bin/pg_test_timing/pg_test_timing.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ handle_args(int argc, char *argv[])
6161
}
6262
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
6363
{
64-
puts("pg_test_timing (Percona Server for PostgreSQL) " PG_VERSION);
64+
puts("pg_test_timing (PostgreSQL) " PG_VERSION);
6565
exit(0);
6666
}
6767
}

‎src/bin/pg_upgrade/exec.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ check_exec(const char *dir, const char *program, bool check_version)
448448
{
449449
pg_strip_crlf(line);
450450

451-
snprintf(versionstr, sizeof(versionstr), "%s (Percona Server for PostgreSQL) " PG_VERSION, program);
451+
snprintf(versionstr, sizeof(versionstr), "%s (PostgreSQL) " PG_VERSION, program);
452452

453453
if (strcmp(line, versionstr) != 0)
454454
pg_fatal("check for \"%s\" failed: incorrect version: found \"%s\", expected \"%s\"",

‎src/bin/pg_upgrade/option.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ parseCommandLine(int argc, char *argv[])
9595
}
9696
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
9797
{
98-
puts("pg_upgrade (Percona Server for PostgreSQL) " PG_VERSION);
98+
puts("pg_upgrade (PostgreSQL) " PG_VERSION);
9999
exit(0);
100100
}
101101
}

‎src/bin/pg_verifybackup/pg_verifybackup.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ main(int argc, char **argv)
211211
}
212212
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
213213
{
214-
puts("pg_verifybackup (Percona Server for PostgreSQL) " PG_VERSION);
214+
puts("pg_verifybackup (PostgreSQL) " PG_VERSION);
215215
exit(0);
216216
}
217217
}
@@ -310,7 +310,7 @@ main(int argc, char **argv)
310310

311311
pg_waldump_path = pg_malloc(MAXPGPATH);
312312
ret = find_other_exec(argv[0], "pg_waldump",
313-
"pg_waldump (Percona Server for PostgreSQL) " PG_VERSION "\n",
313+
"pg_waldump (PostgreSQL) " PG_VERSION "\n",
314314
pg_waldump_path);
315315
if (ret < 0)
316316
{

‎src/bin/pg_waldump/pg_waldump.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ main(int argc, char **argv)
859859
}
860860
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
861861
{
862-
puts("pg_waldump (Percona Server for PostgreSQL) " PG_VERSION);
862+
puts("pg_waldump (PostgreSQL) " PG_VERSION);
863863
exit(0);
864864
}
865865
}

‎src/bin/pgbench/pgbench.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6723,7 +6723,7 @@ main(int argc, char **argv)
67236723
}
67246724
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
67256725
{
6726-
puts("pgbench (Percona Server for PostgreSQL) " PG_VERSION);
6726+
puts("pgbench (PostgreSQL) " PG_VERSION);
67276727
exit(0);
67286728
}
67296729
}

‎src/bin/psql/startup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ process_psqlrc_file(char *filename)
838838
static void
839839
showVersion(void)
840840
{
841-
puts("psql (Percona Server for PostgreSQL) " PG_VERSION);
841+
puts("psql (PostgreSQL) " PG_VERSION);
842842
}
843843

844844

‎src/fe_utils/option_utils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ handle_help_version_opts(int argc, char *argv[],
3333
}
3434
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
3535
{
36-
printf("%s (Percona Server for PostgreSQL) " PG_VERSION "\n", fixed_progname);
36+
printf("%s (PostgreSQL) " PG_VERSION "\n", fixed_progname);
3737
exit(0);
3838
}
3939
}

‎src/include/port.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ extern int find_other_exec(const char *argv0, const char *target,
140140
extern char *pipe_read_line(char *cmd);
141141

142142
/* Doesn't belong here, but this is used with find_other_exec(), so... */
143-
#define PG_BACKEND_VERSIONSTR "postgres (Percona Server for PostgreSQL) " PG_VERSION "\n"
143+
#define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
144144

145145
#ifdef EXEC_BACKEND
146146
/* Disable ASLR before exec, for developer builds only (in exec.c) */

‎src/interfaces/ecpg/preproc/ecpg.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ main(int argc, char *const argv[])
162162
}
163163
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
164164
{
165-
printf("ecpg (Percona Server for PostgreSQL) %s\n", PG_VERSION);
165+
printf("ecpg (PostgreSQL) %s\n", PG_VERSION);
166166
exit(0);
167167
}
168168
}

‎src/test/isolation/isolation_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ char saved_argv0[MAXPGPATH];
1919
char isolation_exec[MAXPGPATH];
2020
bool looked_up_isolation_exec = false;
2121

22-
#define PG_ISOLATION_VERSIONSTR "isolationtester (Percona Server for PostgreSQL) " PG_VERSION "\n"
22+
#define PG_ISOLATION_VERSIONSTR "isolationtester (PostgreSQL) " PG_VERSION "\n"
2323

2424
/*
2525
* start an isolation tester process for specified file (including

‎src/test/isolation/isolationtester.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ main(int argc, char **argv)
9999
switch (opt)
100100
{
101101
case 'V':
102-
puts("isolationtester (Percona Server for PostgreSQL) " PG_VERSION);
102+
puts("isolationtester (PostgreSQL) " PG_VERSION);
103103
exit(0);
104104
default:
105105
fprintf(stderr, "Usage: isolationtester [CONNINFO]\n");

‎src/test/regress/pg_regress.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2163,7 +2163,7 @@ regression_main(int argc, char *argv[],
21632163
help();
21642164
exit(0);
21652165
case 'V':
2166-
puts("pg_regress (Percona Server for PostgreSQL) " PG_VERSION);
2166+
puts("pg_regress (PostgreSQL) " PG_VERSION);
21672167
exit(0);
21682168
case 1:
21692169

0 commit comments

Comments
 (0)