mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a 'datallowconn' check for avoiding 'template0', rather than

Browse Source 
hardcoding a 'template0' check, per suggestion from Alvaro.

This might fix a problem where someone has allowed 'template0'
connections, but it is a cleaner approach even if doesn't fix the
bug.
This commit is contained in:
Bruce Momjian 2010-05-18 18:40:51 +00:00
parent 60e7f45966
commit 64719a18db
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pg_upgrade/pg_upgrade.c
View File

@ -304,15 +304,14 @@ set_frozenxids(migratorContext *ctx)
PQclear(executeQueryOrDie(ctx, conn, PQclear(executeQueryOrDie(ctx, conn,
"UPDATE pg_catalog.pg_database " "UPDATE pg_catalog.pg_database "
"SET datfrozenxid = '%u' " "SET datfrozenxid = '%u' "
/* cannot connect to 'template0', so ignore */ "WHERE datallowconn = true",
"WHERE datname != 'template0'",
ctx->old.controldata.chkpnt_nxtxid)); ctx->old.controldata.chkpnt_nxtxid));
/* get database names */ /* get database names */
dbres = executeQueryOrDie(ctx, conn, dbres = executeQueryOrDie(ctx, conn,
"SELECT datname " "SELECT datname "
"FROM pg_catalog.pg_database " "FROM pg_catalog.pg_database "
"WHERE datname != 'template0'"); "WHERE datallowconn = true");
/* free dbres below */ /* free dbres below */
PQfinish(conn); PQfinish(conn);