8000 Fix new pg_upgrade query not to rely on regnamespace · postgres/postgres@94dc2b3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 94dc2b3

Browse files
author
Álvaro Herrera
committed
Fix new pg_upgrade query not to rely on regnamespace
That was invented in 9.5, and pg_upgrade claims to support back to 9.0. But we don't need that with a simple query change, tested by Tom Lane. Discussion: https://postgr.es/m/202507041645.afjl5rssvrgu@alvherre.pgsql
1 parent ea3386c commit 94dc2b3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

‎src/bin/pg_upgrade/check.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,12 +1239,13 @@ check_for_not_null_inheritance(ClusterInfo *cluster)
12391239
PGconn *conn = connectToServer(&old_cluster, active_db->db_name);
12401240

12411241
res = executeQueryOrDie(conn,
1242-
"SELECT cc.relnamespace::pg_catalog.regnamespace AS nspname, "
1243-
" cc.relname, ac.attname "
1242+
"SELECT nspname, cc.relname, ac.attname "
12441243
"FROM pg_catalog.pg_inherits i, pg_catalog.pg_attribute ac, "
1245-
" pg_catalog.pg_attribute ap, pg_catalog.pg_class cc "
1244+
" pg_catalog.pg_attribute ap, pg_catalog.pg_class cc, "
1245+
" pg_catalog.pg_namespace nc "
12461246
"WHERE cc.oid = ac.attrelid AND i.inhrelid = ac.attrelid "
12471247
" AND i.inhparent = ap.attrelid AND ac.attname = ap.attname "
1248+
" AND cc.relnamespace = nc.oid "
12481249
" AND ap.attnum > 0 and ap.attnotnull AND NOT ac.attnotnull");
12491250

12501251
ntup = PQntuples(res);

0 commit comments

Comments
 (0)
0