Fix new SQL tablespace location function usage in pg_upgrade to properly

check cluster version numbers, and fix missing table alias.

diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index e8361cec29c6a128ce019a266ede2da38ffca7dc..692cdc2e6248fb80100750766cb83f34c1a26fc3 100644 (file)
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -204,7 +204,7 @@ get_db_infos(ClusterInfo *cluster)
        /* we don't preserve pg_database.oid so we sort by name */
                        "ORDER BY 2",
        /* 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");
 
        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 */
                         "ORDER BY 1;",
        /* 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",
        /* see the comment at the top of old_8_3_create_sequence_script() */
                         (GET_MAJOR_VERSION(old_cluster.major_version) <= 803) ?

diff --git a/contrib/pg_upgrade/tablespace.c b/contrib/pg_upgrade/tablespace.c
index 11fd9d091f179bd94eab83e68f039b589a6ef2df..6b61f4bac11cc320b106ea65adc7152016be4820 100644 (file)
--- a/contrib/pg_upgrade/tablespace.c
+++ b/contrib/pg_upgrade/tablespace.c
@@ -53,7 +53,7 @@ get_tablespace_paths(void)
                         "              spcname != 'pg_global'",
        /* 9.2 removed the spclocation column */
                        (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);