Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9c99784

Browse files
author
Nikita Glukhov
committed
Rename Ctor => Constructor
1 parent c1010e2 commit 9c99784

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/backend/executor/execExpr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2180,14 +2180,14 @@ ExecInitExprRec(Expr *node, ExprState *state,
21802180
bool is_jsonb =
21812181
ctor->returning->format->format == JS_FORMAT_JSONB;
21822182

2183-
scratch.d.json_ctor.arg_type_cache =
2184-
palloc(sizeof(*scratch.d.json_ctor.arg_type_cache) * nargs);
2183+
scratch.d.json_constructor.arg_type_cache =
2184+
palloc(sizeof(*scratch.d.json_constructor.arg_type_cache) * nargs);
21852185

21862186
for (int i = 0; i < nargs; i++)
21872187
{
21882188
int category;
21892189
Oid outfuncid;
2190-
Oid typid = scratch.d.json_ctor.arg_types[i];
2190+
Oid typid = scratch.d.json_constructor.arg_types[i];
21912191

21922192
if (is_jsonb)
21932193
{
@@ -2206,8 +2206,8 @@ ExecInitExprRec(Expr *node, ExprState *state,
22062206
category = (int) jscat;
22072207
}
22082208

2209-
scratch.d.json_ctor.arg_type_cache[i].outfuncid = outfuncid;
2210-
scratch.d.json_ctor.arg_type_cache[i].category = category;
2209+
scratch.d.json_constructor.arg_type_cache[i].outfuncid = outfuncid;
2210+
scratch.d.json_constructor.arg_type_cache[i].category = category;
22112211
}
22122212
}
22132213

src/backend/executor/execExprInterp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
15821582
op->d.json_constructor.constructor->unique);
15831583
else if (ctor->type == JSCTOR_JSON_SCALAR)
15841584
{
1585-
if (op->d.json_ctor.arg_nulls[0])
1585+
if (op->d.json_constructor.arg_nulls[0])
15861586
{
15871587
res = (Datum) 0;
15881588
isnull = true;

src/backend/parser/parse_expr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4908,6 +4908,6 @@ transformJsonScalarExpr(ParseState *pstate, JsonScalarExpr *jsexpr)
49084908
if (exprType(arg) == UNKNOWNOID)
49094909
arg = coerce_to_specific_type(pstate, arg, TEXTOID, "JSON_SCALAR");
49104910

4911-
return makeJsonCtorExpr(pstate, JSCTOR_JSON_SCALAR, list_make1(arg), NULL,
4911+
return makeJsonConstructorExpr(pstate, JSCTOR_JSON_SCALAR, list_make1(arg), NULL,
49124912
returning, false, false, jsexpr->location);
49134913
}

0 commit comments

Comments
 (0)