aboutsummaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorÁlvaro Herrera <alvherre@kurilemu.de>2025-07-04 21:30:05 +0200
committerÁlvaro Herrera <alvherre@kurilemu.de>2025-07-04 21:30:05 +0200
commit144ad723a4484927266a316d1c9550d56745ff67 (patch)
tree98f0c56e9d4ebd2946b560361608476aeb6e14c2 /src/bin
parent90a85fce5e9b9ea63ec7e1b3001e0f39d4c8b7d4 (diff)
downloadpostgresql-master.tar.gz
postgresql-master.zip
Fix new pg_upgrade query not to rely on regnamespaceHEADmaster
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
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/pg_upgrade/check.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index a756ddbd254..30579ef2051 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -1689,12 +1689,13 @@ check_for_not_null_inheritance(ClusterInfo *cluster)
log_opts.basedir,
"not_null_inconsistent_columns.txt");
- query = "SELECT cc.relnamespace::pg_catalog.regnamespace AS nspname, "
- " cc.relname, ac.attname "
+ query = "SELECT nspname, cc.relname, ac.attname "
"FROM pg_catalog.pg_inherits i, pg_catalog.pg_attribute ac, "
- " pg_catalog.pg_attribute ap, pg_catalog.pg_class cc "
+ " pg_catalog.pg_attribute ap, pg_catalog.pg_class cc, "
+ " pg_catalog.pg_namespace nc "
"WHERE cc.oid = ac.attrelid AND i.inhrelid = ac.attrelid "
" AND i.inhparent = ap.attrelid AND ac.attname = ap.attname "
+ " AND cc.relnamespace = nc.oid "
" AND ap.attnum > 0 and ap.attnotnull AND NOT ac.attnotnull";
task = upgrade_task_create();