Skip to content

P
Postgres FD Implementation
Commit a54ba23c authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Improve pg_upgrade relation name check logic for pre-8.4 servers.

parent 8f87dcd8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
contrib/pg_upgrade/info.c
View file @ a54ba23c
...@@ -56,11 +56,11 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, ...@@ -56,11 +56,11 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
/* /*
* In pre-8.4, TOAST table names change during CLUSTER; in >= 8.4 * In pre-8.4, TOAST table names change during CLUSTER; in >= 8.4
* TOAST relation names always use the heap tables oid, hence we * TOAST relation names always use heap table oids, hence we
* cannot check relation names when upgrading from pre-8.4. * cannot check relation names when upgrading from pre-8.4.
*/ */
if (GET_MAJOR_VERSION(old_cluster.major_version) >= 804 && if (strcmp(old_rel->nspname, new_rel->nspname) != 0 ||
(strcmp(old_rel->nspname, new_rel->nspname) != 0 || (GET_MAJOR_VERSION(old_cluster.major_version) >= 804 &&
strcmp(old_rel->relname, new_rel->relname) != 0)) strcmp(old_rel->relname, new_rel->relname) != 0))
pg_log(PG_FATAL, "Mismatch of relation names: database \"%s\", " pg_log(PG_FATAL, "Mismatch of relation names: database \"%s\", "
"old rel %s.%s, new rel %s.%s\n", "old rel %s.%s, new rel %s.%s\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment