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

Commit 1e00772

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 5aba3e6 commit 1e00772

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
@@ -1688,12 +1688,13 @@ check_for_not_null_inheritance(ClusterInfo *cluster)
16881688
log_opts.basedir,
16891689
"not_null_inconsistent_columns.txt");
16901690

1691-
query = "SELECT cc.relnamespace::pg_catalog.regnamespace AS nspname, "
1692-
" cc.relname, ac.attname "
1691+
query = "SELECT nspname, cc.relname, ac.attname "
16931692
"FROM pg_catalog.pg_inherits i, pg_catalog.pg_attribute ac, "
1694-
" pg_catalog.pg_attribute ap, pg_catalog.pg_class cc "
1693+
" pg_catalog.pg_attribute ap, pg_catalog.pg_class cc, "
1694+
" pg_catalog.pg_namespace nc "
16951695
"WHERE cc.oid = ac.attrelid AND i.inhrelid = ac.attrelid "
16961696
" AND i.inhparent = ap.attrelid AND ac.attname = ap.attname "
1697+
" AND cc.relnamespace = nc.oid "
16971698
" AND ap.attnum > 0 and ap.attnotnull AND NOT ac.attnotnull";
16981699

16991700
task = upgrade_task_create();

0 commit comments

Comments
 (0)
0