Skip to content

Commit 8c9ec15

Browse files
committed
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
1 parent cbe9c39 commit 8c9ec15

File tree

31 files changed

+35
-35
lines changed

31 files changed

+35
-35
lines changed

contrib/oid2name/oid2name.c

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
}

0 commit comments

Comments
 (0)