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.
This commit is contained in:
Noah Misch 2015-05-02 16:46:23 -04:00
parent 67df9782e9
commit b339a5cf90

View File

@ -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;
}