aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/pg_upgrade_support.c
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2017-03-12 19:35:31 -0400
committerNoah Misch <noah@leadboat.com>2017-03-12 19:35:31 -0400
commit2fd26b23b662dcb0cf649e983a58581cb911fc4b (patch)
tree2aac3510bbd79eb36b721277e9a1398fa3dfaef5 /src/backend/utils/adt/pg_upgrade_support.c
parent9e0926468a1c41a31c09785787a737311dcd92c1 (diff)
downloadpostgresql-2fd26b23b662dcb0cf649e983a58581cb911fc4b.tar.gz
postgresql-2fd26b23b662dcb0cf649e983a58581cb911fc4b.zip
Assume deconstruct_array() outputs are untoasted.
In functions that issue a deconstruct_array() call, consistently use plain VARSIZE()/VARDATA() on the array elements. Prior practice was divided between those and VARSIZE_ANY_EXHDR()/VARDATA_ANY().
Diffstat (limited to 'src/backend/utils/adt/pg_upgrade_support.c')
-rw-r--r--src/backend/utils/adt/pg_upgrade_support.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/backend/utils/adt/pg_upgrade_support.c b/src/backend/utils/adt/pg_upgrade_support.c
index 282b2649ffc..4b340055f0f 100644
--- a/src/backend/utils/adt/pg_upgrade_support.c
+++ b/src/backend/utils/adt/pg_upgrade_support.c
@@ -163,8 +163,7 @@ binary_upgrade_create_empty_extension(PG_FUNCTION_ARGS)
&textDatums, NULL, &ndatums);
for (i = 0; i < ndatums; i++)
{
- text *txtname = DatumGetTextPP(textDatums[i]);
- char *extName = text_to_cstring(txtname);
+ char *extName = TextDatumGetCString(textDatums[i]);
Oid extOid = get_extension_oid(extName, false);
requiredExtensions = lappend_oid(requiredExtensions, extOid);