mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new SQL tablespace location function usage in pg_upgrade to properly

Browse Source 
check cluster version numbers, and fix missing table alias.
This commit is contained in:
Bruce Momjian 2012-01-24 21:51:10 -05:00
parent 443b4821f1
commit b95aec5290
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/pg_upgrade/info.c
View File

@ -204,7 +204,7 @@ get_db_infos(ClusterInfo *cluster)
/* we don't preserve pg_database.oid so we sort by name */ /* we don't preserve pg_database.oid so we sort by name */
"ORDER BY 2", "ORDER BY 2",
/* 9.2 removed the spclocation column */ /* 9.2 removed the spclocation column */
(GET_MAJOR_VERSION(old_cluster.major_version) <= 901) ? (GET_MAJOR_VERSION(cluster->major_version) <= 901) ?
"t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation"); "t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation");
res = executeQueryOrDie(conn, "%s", query); res = executeQueryOrDie(conn, "%s", query);
@ -287,7 +287,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
/* we preserve pg_class.oid so we sort by it to match old/new */ /* we preserve pg_class.oid so we sort by it to match old/new */
"ORDER BY 1;", "ORDER BY 1;",
/* 9.2 removed the spclocation column */ /* 9.2 removed the spclocation column */
(GET_MAJOR_VERSION(old_cluster.major_version) <= 901) ? (GET_MAJOR_VERSION(cluster->major_version) <= 901) ?
"t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation", "t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation",
/* see the comment at the top of old_8_3_create_sequence_script() */ /* see the comment at the top of old_8_3_create_sequence_script() */
(GET_MAJOR_VERSION(old_cluster.major_version) <= 803) ? (GET_MAJOR_VERSION(old_cluster.major_version) <= 803) ?

2
contrib/pg_upgrade/tablespace.c
View File

@ -53,7 +53,7 @@ get_tablespace_paths(void)
" spcname != 'pg_global'", " spcname != 'pg_global'",
/* 9.2 removed the spclocation column */ /* 9.2 removed the spclocation column */
(GET_MAJOR_VERSION(old_cluster.major_version) <= 901) ? (GET_MAJOR_VERSION(old_cluster.major_version) <= 901) ?
"t.spclocation" : "pg_catalog.pg_tablespace_location(oid) AS spclocation"); "spclocation" : "pg_catalog.pg_tablespace_location(oid) AS spclocation");
res = executeQueryOrDie(conn, "%s", query); res = executeQueryOrDie(conn, "%s", query);