database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Adjust pg_upgrade error message, array freeing, and add error check.

Browse Source
This commit is contained in:
Bruce Momjian
2011-02-15 15:00:07 -05:00
parent f5fc1de501
commit fe8f15d5d2
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/pg_upgrade/info.c
View File

@ -104,6 +104,12 @@ create_rel_filename_map(const char *old_data, const char *new_data,
/* new_relfilenode will match old and new pg_class.oid */
map->new_relfilenode = new_rel->relfilenode;
if (strcmp(old_rel->nspname, new_rel->nspname) != 0 ||
strcmp(old_rel->relname, new_rel->relname) != 0)
pg_log(PG_FATAL, "mismatch of relation id: database \"%s\", old rel %s.%s, new rel %s.%s\n",
old_db, old_rel->nspname, old_rel->relname,
new_rel->nspname, new_rel->relname);
/* used only for logging and error reporing, old/new are identical */
snprintf(map->nspname, sizeof(map->nspname), "%s", old_rel->nspname);
snprintf(map->relname, sizeof(map->relname), "%s", old_rel->relname);
@ -141,6 +147,9 @@ get_db_and_rel_infos(ClusterInfo *cluster)
{
int dbnum;
if (cluster->dbarr)
free_db_and_rel_infos(cluster->dbarr);
get_db_infos(cluster);
for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)