diff options
Diffstat (limited to 'src/backend/nodes/copyfuncs.c')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 90ebd7819a7..83322320b09 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.399 2008/08/07 19:35:02 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.400 2008/08/14 18:47:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1444,36 +1444,37 @@ _copyRestrictInfo(RestrictInfo *from) } /* - * _copyOuterJoinInfo + * _copyFlattenedSubLink */ -static OuterJoinInfo * -_copyOuterJoinInfo(OuterJoinInfo *from) +static FlattenedSubLink * +_copyFlattenedSubLink(FlattenedSubLink *from) { - OuterJoinInfo *newnode = makeNode(OuterJoinInfo); + FlattenedSubLink *newnode = makeNode(FlattenedSubLink); - COPY_BITMAPSET_FIELD(min_lefthand); - COPY_BITMAPSET_FIELD(min_righthand); - COPY_BITMAPSET_FIELD(syn_lefthand); - COPY_BITMAPSET_FIELD(syn_righthand); - COPY_SCALAR_FIELD(is_full_join); - COPY_SCALAR_FIELD(lhs_strict); - COPY_SCALAR_FIELD(delay_upper_joins); + COPY_SCALAR_FIELD(jointype); + COPY_BITMAPSET_FIELD(lefthand); + COPY_BITMAPSET_FIELD(righthand); + COPY_NODE_FIELD(quals); return newnode; } /* - * _copyInClauseInfo + * _copySpecialJoinInfo */ -static InClauseInfo * -_copyInClauseInfo(InClauseInfo *from) +static SpecialJoinInfo * +_copySpecialJoinInfo(SpecialJoinInfo *from) { - InClauseInfo *newnode = makeNode(InClauseInfo); + SpecialJoinInfo *newnode = makeNode(SpecialJoinInfo); - COPY_BITMAPSET_FIELD(lefthand); - COPY_BITMAPSET_FIELD(righthand); - COPY_NODE_FIELD(sub_targetlist); - COPY_NODE_FIELD(in_operators); + COPY_BITMAPSET_FIELD(min_lefthand); + COPY_BITMAPSET_FIELD(min_righthand); + COPY_BITMAPSET_FIELD(syn_lefthand); + COPY_BITMAPSET_FIELD(syn_righthand); + COPY_SCALAR_FIELD(jointype); + COPY_SCALAR_FIELD(lhs_strict); + COPY_SCALAR_FIELD(delay_upper_joins); + COPY_NODE_FIELD(join_quals); return newnode; } @@ -3233,11 +3234,11 @@ copyObject(void *from) case T_RestrictInfo: retval = _copyRestrictInfo(from); break; - case T_OuterJoinInfo: - retval = _copyOuterJoinInfo(from); + case T_FlattenedSubLink: + retval = _copyFlattenedSubLink(from); break; - case T_InClauseInfo: - retval = _copyInClauseInfo(from); + case T_SpecialJoinInfo: + retval = _copySpecialJoinInfo(from); break; case T_AppendRelInfo: retval = _copyAppendRelInfo(from); |