Commitb95aec5

committed

Fix new SQL tablespace location function usage in pg_upgrade to properly

check cluster version numbers, and fix missing table alias.

1 parent443b482 commitb95aec5Copy full SHA for b95aec5

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ get_db_infos(ClusterInfo *cluster)`
`204`	`204`	`/* we don't preserve pg_database.oid so we sort by name */`
`205`	`205`	`"ORDER BY 2",`
`206`	`206`	`/* 9.2 removed the spclocation column */`
`207`		`-(GET_MAJOR_VERSION(old_cluster.major_version) <=901) ?`
	`207`	`+(GET_MAJOR_VERSION(cluster->major_version) <=901) ?`
`208`	`208`	`"t.spclocation" :"pg_catalog.pg_tablespace_location(t.oid) AS spclocation");`
`209`	`209`
`210`	`210`	`res=executeQueryOrDie(conn,"%s",query);`
`@@ -287,7 +287,7 @@ get_rel_infos(ClusterInfo cluster, DbInfo dbinfo)`
`287`	`287`	`/* we preserve pg_class.oid so we sort by it to match old/new */`
`288`	`288`	`"ORDER BY 1;",`
`289`	`289`	`/* 9.2 removed the spclocation column */`
`290`		`- (GET_MAJOR_VERSION(old_cluster.major_version) <=901) ?`
	`290`	`+ (GET_MAJOR_VERSION(cluster->major_version) <=901) ?`
`291`	`291`	`"t.spclocation" :"pg_catalog.pg_tablespace_location(t.oid) AS spclocation",`
`292`	`292`	`/* see the comment at the top of old_8_3_create_sequence_script() */`
`293`	`293`	`(GET_MAJOR_VERSION(old_cluster.major_version) <=803) ?`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ get_tablespace_paths(void)`
`53`	`53`	`"spcname != 'pg_global'",`
`54`	`54`	`/* 9.2 removed the spclocation column */`
`55`	`55`	`(GET_MAJOR_VERSION(old_cluster.major_version) <=901) ?`
`56`		`-"t.spclocation" :"pg_catalog.pg_tablespace_location(oid) AS spclocation");`
	`56`	`+"spclocation" :"pg_catalog.pg_tablespace_location(oid) AS spclocation");`
`57`	`57`
`58`	`58`	`res=executeQueryOrDie(conn,"%s",query);`
`59`	`59`

Comments

(0)