diff options
Diffstat (limited to 'src/backend/parser/analyze.c')
| -rw-r--r-- | src/backend/parser/analyze.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 0d1d3dcb248..5837fa8fb70 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.58 1997/12/29 01:12:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.59 1997/12/29 04:31:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -828,6 +828,7 @@ transformSelectStmt(ParseState *pstate, RetrieveStmt *stmt) /* fix order clause */ qry->sortClause = transformSortClause(pstate, stmt->sortClause, + NIL, qry->targetList, qry->uniqueFlag); @@ -842,9 +843,6 @@ transformSelectStmt(ParseState *pstate, RetrieveStmt *stmt) qry->unionall = stmt->unionall; /* in child, so unionClause may be false */ qry->unionClause = transformUnionClause(stmt->unionClause, qry->targetList); - if (qry->unionClause && stmt->sortClause) - elog(WARN, "You can not use ORDER BY with UNION", NULL); - return (Query *) qry; } @@ -918,6 +916,7 @@ transformCursorStmt(ParseState *pstate, CursorStmt *stmt) /* fix order clause */ qry->sortClause = transformSortClause(pstate, stmt->sortClause, + NIL, qry->targetList, qry->uniqueFlag); /* fix group by clause */ |