diff options
Diffstat (limited to 'src/backend/nodes/copyfuncs.c')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 2e1ce4cb0d7..652c726a670 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.395 2008/07/16 01:30:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.396 2008/08/02 21:31:59 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1542,24 +1542,13 @@ _copyFkConstraint(FkConstraint *from) return newnode; } -static SortClause * -_copySortClause(SortClause *from) +static SortGroupClause * +_copySortGroupClause(SortGroupClause *from) { - SortClause *newnode = makeNode(SortClause); - - COPY_SCALAR_FIELD(tleSortGroupRef); - COPY_SCALAR_FIELD(sortop); - COPY_SCALAR_FIELD(nulls_first); - - return newnode; -} - -static GroupClause * -_copyGroupClause(GroupClause *from) -{ - GroupClause *newnode = makeNode(GroupClause); + SortGroupClause *newnode = makeNode(SortGroupClause); COPY_SCALAR_FIELD(tleSortGroupRef); + COPY_SCALAR_FIELD(eqop); COPY_SCALAR_FIELD(sortop); COPY_SCALAR_FIELD(nulls_first); @@ -1861,6 +1850,7 @@ _copyQuery(Query *from) COPY_NODE_FIELD(intoClause); COPY_SCALAR_FIELD(hasAggs); COPY_SCALAR_FIELD(hasSubLinks); + COPY_SCALAR_FIELD(hasDistinctOn); COPY_NODE_FIELD(rtable); COPY_NODE_FIELD(jointree); COPY_NODE_FIELD(targetList); @@ -3586,11 +3576,8 @@ copyObject(void *from) case T_RangeTblEntry: retval = _copyRangeTblEntry(from); break; - case T_SortClause: - retval = _copySortClause(from); - break; - case T_GroupClause: - retval = _copyGroupClause(from); + case T_SortGroupClause: + retval = _copySortGroupClause(from); break; case T_RowMarkClause: retval = _copyRowMarkClause(from); |