database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Clarify pg_upgrade's creation of the map file structure. Also clean

Browse Source 
up pg_dump's calling of pg_upgrade_support functions.
This commit is contained in:
Bruce Momjian
2011-01-05 11:37:08 -05:00
parent 66a8a0428d
commit 5cff5b5779
4 changed files with 69 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/pg_upgrade/version_old_8_3.c
View File

@ -222,8 +222,8 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
{
PGresult *res;
bool db_used = false;
char old_nspname[NAMEDATALEN] = "",
old_relname[NAMEDATALEN] = "";
char nspname[NAMEDATALEN] = "",
relname[NAMEDATALEN] = "";
int ntups;
int rowno;
int i_nspname,
@ -283,10 +283,10 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
}
/* Rebuild all tsvector collumns with one ALTER TABLE command */
if (strcmp(PQgetvalue(res, rowno, i_nspname), old_nspname) != 0 ||
strcmp(PQgetvalue(res, rowno, i_relname), old_relname) != 0)
if (strcmp(PQgetvalue(res, rowno, i_nspname), nspname) != 0 ||
strcmp(PQgetvalue(res, rowno, i_relname), relname) != 0)
{
if (strlen(old_nspname) != 0 || strlen(old_relname) != 0)
if (strlen(nspname) != 0 || strlen(relname) != 0)
fprintf(script, ";\n\n");
fprintf(script, "ALTER TABLE %s.%s\n",
quote_identifier(PQgetvalue(res, rowno, i_nspname)),
@ -294,8 +294,8 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
}
else
fprintf(script, ",\n");
strlcpy(old_nspname, PQgetvalue(res, rowno, i_nspname), sizeof(old_nspname));
strlcpy(old_relname, PQgetvalue(res, rowno, i_relname), sizeof(old_relname));
strlcpy(nspname, PQgetvalue(res, rowno, i_nspname), sizeof(nspname));
strlcpy(relname, PQgetvalue(res, rowno, i_relname), sizeof(relname));
fprintf(script, "ALTER COLUMN %s "
/* This could have been a custom conversion function call. */
@ -304,7 +304,7 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
quote_identifier(PQgetvalue(res, rowno, i_attname)));
}
}
if (strlen(old_nspname) != 0 || strlen(old_relname) != 0)
if (strlen(nspname) != 0 || strlen(relname) != 0)
fprintf(script, ";\n\n");
PQclear(res);