1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_upgrade; change major version comparisons to use <=, not <

Browse Source 
This makes checking for older major versions more consistent.

Backpatch-through: 9.5
This commit is contained in:
Bruce Momjian 2020-10-06 12:12:09 -04:00
parent 997188b6e0
commit 0e78dcaf73
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/pg_upgrade/check.c
View File

@ -227,7 +227,7 @@ check_cluster_versions(void)
* upgrades * upgrades
*/ */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 804) if (GET_MAJOR_VERSION(old_cluster.major_version) <= 803)
pg_fatal("This utility can only upgrade from PostgreSQL version 8.4 and later.\n"); pg_fatal("This utility can only upgrade from PostgreSQL version 8.4 and later.\n");
/* Only current PG version is supported as a target */ /* Only current PG version is supported as a target */
@ -274,7 +274,7 @@ check_cluster_compatibility(bool live_check)
"because of backend API changes made during development.\n"); "because of backend API changes made during development.\n");
/* We read the real port number for PG >= 9.1 */ /* We read the real port number for PG >= 9.1 */
if (live_check && GET_MAJOR_VERSION(old_cluster.major_version) < 901 && if (live_check && GET_MAJOR_VERSION(old_cluster.major_version) <= 900 &&
old_cluster.port == DEF_PGUPORT) old_cluster.port == DEF_PGUPORT)
pg_fatal("When checking a pre-PG 9.1 live old server, " pg_fatal("When checking a pre-PG 9.1 live old server, "
"you must specify the old server's port number.\n"); "you must specify the old server's port number.\n");
@ -480,7 +480,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
fprintf(script, "\"%s/vacuumdb\" %s--all --analyze-in-stages\n", fprintf(script, "\"%s/vacuumdb\" %s--all --analyze-in-stages\n",
new_cluster.bindir, user_specification.data); new_cluster.bindir, user_specification.data);
/* Did we copy the free space files? */ /* Did we copy the free space files? */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 804) if (GET_MAJOR_VERSION(old_cluster.major_version) <= 803)
fprintf(script, "\"%s/vacuumdb\" %s--all\n", new_cluster.bindir, fprintf(script, "\"%s/vacuumdb\" %s--all\n", new_cluster.bindir,
user_specification.data); user_specification.data);

4
src/bin/pg_upgrade/function.c
View File

@ -86,7 +86,7 @@ get_loadable_libraries(void)
* http://archives.postgresql.org/pgsql-hackers/2012-03/msg01101.php * http://archives.postgresql.org/pgsql-hackers/2012-03/msg01101.php
* http://archives.postgresql.org/pgsql-bugs/2012-05/msg00206.php * http://archives.postgresql.org/pgsql-bugs/2012-05/msg00206.php
*/ */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 901) if (GET_MAJOR_VERSION(old_cluster.major_version) <= 900)
{ {
PGresult *res; PGresult *res;
@ -232,7 +232,7 @@ check_loadable_libraries(void)
* for languages, and does not help with function shared objects, so * for languages, and does not help with function shared objects, so
* we just do a general fix. * we just do a general fix.
*/ */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 901 && if (GET_MAJOR_VERSION(old_cluster.major_version) <= 900 &&
strcmp(lib, "$libdir/plpython") == 0) strcmp(lib, "$libdir/plpython") == 0)
{ {
lib = "$libdir/plpython2"; lib = "$libdir/plpython2";

2
src/bin/pg_upgrade/pg_upgrade.c
View File

@ -350,7 +350,7 @@ create_new_objects(void)
* We don't have minmxids for databases or relations in pre-9.3 clusters, * We don't have minmxids for databases or relations in pre-9.3 clusters,
* so set those after we have restored the schema. * so set those after we have restored the schema.
*/ */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 903) if (GET_MAJOR_VERSION(old_cluster.major_version) <= 902)
set_frozenxids(true); set_frozenxids(true);
/* regenerate now that we have objects in the databases */ /* regenerate now that we have objects in the databases */

2
src/bin/pg_upgrade/server.c
View File

@ -213,7 +213,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
snprintf(socket_string + strlen(socket_string), snprintf(socket_string + strlen(socket_string),
sizeof(socket_string) - strlen(socket_string), sizeof(socket_string) - strlen(socket_string),
" -c %s='%s'", " -c %s='%s'",
(GET_MAJOR_VERSION(cluster->major_version) < 903) ? (GET_MAJOR_VERSION(cluster->major_version) <= 902) ?
"unix_socket_directory" : "unix_socket_directories", "unix_socket_directory" : "unix_socket_directories",
cluster->sockdir); cluster->sockdir);
#endif #endif