From b339a5cf900bb3e72f58a7a96903e3a0d557a85a Mon Sep 17 00:00:00 2001 From: Noah Misch <noah@leadboat.com> Date: Sat, 2 May 2015 16:46:23 -0400 Subject: [PATCH] Rename coerce_type() local variable. coerce_type() has local variables named targetTypeId, baseTypeId, and targetType. targetType has been the Type structure for baseTypeId, so rename it to baseType. --- src/backend/parser/parse_coerce.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index a4e494be7a2..f6e7be4e710 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -245,7 +245,7 @@ coerce_type(ParseState *pstate, Node *node, Oid baseTypeId; int32 baseTypeMod; int32 inputTypeMod; - Type targetType; + Type baseType; ParseCallbackState pcbstate; /* @@ -273,13 +273,13 @@ coerce_type(ParseState *pstate, Node *node, else inputTypeMod = -1; - targetType = typeidType(baseTypeId); + baseType = typeidType(baseTypeId); newcon->consttype = baseTypeId; newcon->consttypmod = inputTypeMod; - newcon->constcollid = typeTypeCollation(targetType); - newcon->constlen = typeLen(targetType); - newcon->constbyval = typeByVal(targetType); + newcon->constcollid = typeTypeCollation(baseType); + newcon->constlen = typeLen(baseType); + newcon->constbyval = typeByVal(baseType); newcon->constisnull = con->constisnull; /* @@ -300,11 +300,11 @@ coerce_type(ParseState *pstate, Node *node, * as CSTRING. */ if (!con->constisnull) - newcon->constvalue = stringTypeDatum(targetType, + newcon->constvalue = stringTypeDatum(baseType, DatumGetCString(con->constvalue), inputTypeMod); else - newcon->constvalue = stringTypeDatum(targetType, + newcon->constvalue = stringTypeDatum(baseType, NULL, inputTypeMod); @@ -319,7 +319,7 @@ coerce_type(ParseState *pstate, Node *node, targetTypeId, cformat, location, false, false); - ReleaseSysCache(targetType); + ReleaseSysCache(baseType); return result; } -- GitLab