mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-03 02:26:52 +02:00
pg_upgrade: Fix thinko in database info acquisition routine
When checking whether the major version supports per-database locale providers, it was always looking at the version of the old cluster instead of the cluster that was passed in. This would lead to failures to detect locale provider mismatches. Reported-by: Marina Polyakova <m.polyakova@postgrespro.ru> Reviewed-by: Julien Rouhaud <rjuju123@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/f385ba25e7f8be427b8c582e5cca7d79%40postgrespro.ru#515a31c5429d6d37ad1d5c9d66962a1e
This commit is contained in:
parent
254d79f0b2
commit
3725b7f3c9
@ -319,7 +319,7 @@ get_db_infos(ClusterInfo *cluster)
|
|||||||
|
|
||||||
snprintf(query, sizeof(query),
|
snprintf(query, sizeof(query),
|
||||||
"SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, ");
|
"SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, ");
|
||||||
if (GET_MAJOR_VERSION(old_cluster.major_version) < 1500)
|
if (GET_MAJOR_VERSION(cluster->major_version) < 1500)
|
||||||
snprintf(query + strlen(query), sizeof(query) - strlen(query),
|
snprintf(query + strlen(query), sizeof(query) - strlen(query),
|
||||||
"'c' AS datlocprovider, NULL AS daticulocale, ");
|
"'c' AS datlocprovider, NULL AS daticulocale, ");
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user