Commit1e00772

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 parent5aba3e6 commit1e00772Copy full SHA for 1e00772

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1688,12 +1688,13 @@ check_for_not_null_inheritance(ClusterInfo *cluster)`
`1688`	`1688`	`log_opts.basedir,`
`1689`	`1689`	`"not_null_inconsistent_columns.txt");`
`1690`	`1690`
`1691`		`-query="SELECT cc.relnamespace::pg_catalog.regnamespace AS nspname, "`
`1692`		`-" cc.relname, ac.attname "`
	`1691`	`+query="SELECT nspname, cc.relname, ac.attname "`
`1693`	`1692`	`"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 "`
`1695`	`1695`	`"WHERE cc.oid = ac.attrelid AND i.inhrelid = ac.attrelid "`
`1696`	`1696`	`" AND i.inhparent = ap.attrelid AND ac.attname = ap.attname "`
	`1697`	`+" AND cc.relnamespace = nc.oid "`
`1697`	`1698`	`" AND ap.attnum > 0 and ap.attnotnull AND NOT ac.attnotnull";`
`1698`	`1699`
`1699`	`1700`	`task=upgrade_task_create();`

Comments

(0)