diff options
| -rw-r--r-- | contrib/pg_upgrade/info.c | 15 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index 7e177d45711..dad0117b93c 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -250,7 +250,8 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) i_nspname, i_relname, i_oid, - i_relfilenode; + i_relfilenode, + i_reltablespace; char query[QUERY_ALLOC]; /* @@ -263,7 +264,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) snprintf(query, sizeof(query), "SELECT c.oid, n.nspname, c.relname, " - " c.relfilenode, t.spclocation " + " c.relfilenode, c.reltablespace, t.spclocation " "FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n " " ON c.relnamespace = n.oid " " LEFT OUTER JOIN pg_catalog.pg_tablespace t " @@ -297,6 +298,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) i_nspname = PQfnumber(res, "nspname"); i_relname = PQfnumber(res, "relname"); i_relfilenode = PQfnumber(res, "relfilenode"); + i_reltablespace = PQfnumber(res, "reltablespace"); i_spclocation = PQfnumber(res, "spclocation"); for (relnum = 0; relnum < ntups; relnum++) @@ -314,10 +316,13 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) curr->relfilenode = atooid(PQgetvalue(res, relnum, i_relfilenode)); - tblspace = PQgetvalue(res, relnum, i_spclocation); - /* if no table tablespace, use the database tablespace */ - if (strlen(tblspace) == 0) + if (atooid(PQgetvalue(res, relnum, i_reltablespace)) != 0) + /* Might be "", meaning the cluster default location. */ + tblspace = PQgetvalue(res, relnum, i_spclocation); + else + /* A zero reltablespace indicates the database tablespace. */ tblspace = dbinfo->db_tblspace; + strlcpy(curr->tablespace, tblspace, sizeof(curr->tablespace)); } PQclear(res); diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 898541b770b..204749b6509 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -71,7 +71,8 @@ typedef struct char relname[NAMEDATALEN]; /* relation name */ Oid reloid; /* relation oid */ Oid relfilenode; /* relation relfile node */ - char tablespace[MAXPGPATH]; /* relations tablespace path */ + /* relation tablespace path, or "" for the cluster default */ + char tablespace[MAXPGPATH]; } RelInfo; typedef struct |