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

Report incompatible roles in pg_upgrade checking

Browse Source 
When checking for roles with a pg_ prefix in <= 9.5 servers, report
all found roles in a text file as how other checks are done instead
of just reporting that they exist. Rolenames are printed with their
Oids to match other reports.

Author: Daniel Gustafsson <daniel@yesql.se>
Reviewed-by: Bruce Momjian <bruce@momjian.us>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/4BB2735C-C347-4CF7-AFB1-8573BE930066@yesql.se
This commit is contained in:
Daniel Gustafsson
2022-12-02 13:10:21 +01:00
parent ab81006299
commit c76da690ba
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1395,27 +1395,52 @@ check_for_pg_role_prefix(ClusterInfo *cluster)
{ {
PGresult *res; PGresult *res;
PGconn *conn = connectToServer(cluster, "template1"); PGconn *conn = connectToServer(cluster, "template1");
int ntups;
int i_roloid;
int i_rolname;
FILE *script = NULL;
char output_path[MAXPGPATH];
prep_status("Checking for roles starting with \"pg_\""); prep_status("Checking for roles starting with \"pg_\"");
snprintf(output_path, sizeof(output_path), "%s/%s",
log_opts.basedir,
"pg_role_prefix.txt");
res = executeQueryOrDie(conn, res = executeQueryOrDie(conn,
"SELECT * " "SELECT oid AS roloid, rolname "
"FROM pg_catalog.pg_roles " "FROM pg_catalog.pg_roles "
"WHERE rolname ~ '^pg_'"); "WHERE rolname ~ '^pg_'");
if (PQntuples(res) != 0) ntups = PQntuples(res);
i_roloid = PQfnumber(res, "roloid");
i_rolname = PQfnumber(res, "rolname");
for (int rowno = 0; rowno < ntups; rowno++)
{ {
if (cluster == &old_cluster) if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
pg_fatal("The source cluster contains roles starting with \"pg_\""); pg_fatal("could not open file \"%s\": %s",
else output_path, strerror(errno));
pg_fatal("The target cluster contains roles starting with \"pg_\""); fprintf(script, "%s (oid=%s)\n",
PQgetvalue(res, rowno, i_rolname),
PQgetvalue(res, rowno, i_roloid));
} }
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
check_ok(); if (script)
{
fclose(script);
pg_log(PG_REPORT, "fatal");
pg_fatal("Your installation contains roles starting with \"pg_\".\n"
"\"pg_\" is a reserved prefix for system roles, the cluster\n"
"cannot be upgraded until these roles are renamed.\n"
"A list of roles starting with \"pg_\" is in the file:\n"
" %s", output_path);
}
else
check_ok();
} }
/* /*