Use macro atooid() for conversion of strings to oids, per suggestion

from Tom.

diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 55489ac1aa94448509688ea15c7f0a8860ddbd12..3b3162292c2a17a7ed67c01064c23eacc1304b7f 100644 (file)
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -242,7 +242,7 @@ get_db_infos(migratorContext *ctx, DbInfoArr *dbinfs_arr, Cluster whichCluster)
 
    for (tupnum = 0; tupnum < ntups; tupnum++)
    {
-       dbinfos[tupnum].db_oid = str2uint(PQgetvalue(res, tupnum, i_oid));
+       dbinfos[tupnum].db_oid = atooid(PQgetvalue(res, tupnum, i_oid));
 
        snprintf(dbinfos[tupnum].db_name, sizeof(dbinfos[tupnum].db_name), "%s",
                 PQgetvalue(res, tupnum, i_datname));
@@ -360,7 +360,7 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
        RelInfo    *curr = &relinfos[num_rels++];
        const char *tblspace;
 
-       curr->reloid = str2uint(PQgetvalue(res, relnum, i_oid));
+       curr->reloid = atooid(PQgetvalue(res, relnum, i_oid));
 
        nspname = PQgetvalue(res, relnum, i_nspname);
        strlcpy(curr->nspname, nspname, sizeof(curr->nspname));
@@ -368,8 +368,8 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
        relname = PQgetvalue(res, relnum, i_relname);
        strlcpy(curr->relname, relname, sizeof(curr->relname));
 
-       curr->relfilenode = str2uint(PQgetvalue(res, relnum, i_relfilenode));
-       curr->toastrelid = str2uint(PQgetvalue(res, relnum, i_reltoastrelid));
+       curr->relfilenode = atooid(PQgetvalue(res, relnum, i_relfilenode));
+       curr->toastrelid = atooid(PQgetvalue(res, relnum, i_reltoastrelid));
 
        tblspace = PQgetvalue(res, relnum, i_spclocation);
        /* if no table tablespace, use the database tablespace */

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 296b80f9834a0e7b31d3a452a66c40c4e14d99ad..73070c6259d85f33967c60d39ec3511541190a0d 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -52,6 +52,8 @@
 
 #define CLUSTERNAME(cluster)   ((cluster) == CLUSTER_OLD ? "old" : "new")
 
+#define atooid(x)  ((Oid) strtoul((x), NULL, 10))
+
 /* OID system catalog preservation added during PG 9.0 development */
 #define TABLE_SPACE_SUBDIRS 201001111
 

diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
index dd605bbe3fcb038ba618b58eca5ee50ee825fe5f..3a11babd640ee452af368c895407b5b97a2d12ff 100644 (file)
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -94,9 +94,9 @@ get_pg_database_relfilenode(migratorContext *ctx, Cluster whichCluster)
 
    i_relfile = PQfnumber(res, "relfilenode");
    if (whichCluster == CLUSTER_OLD)
-       ctx->old.pg_database_oid = str2uint(PQgetvalue(res, 0, i_relfile));
+       ctx->old.pg_database_oid = atooid(PQgetvalue(res, 0, i_relfile));
    else
-       ctx->new.pg_database_oid = str2uint(PQgetvalue(res, 0, i_relfile));
+       ctx->new.pg_database_oid = atooid(PQgetvalue(res, 0, i_relfile));
 
    PQclear(res);
    PQfinish(conn);