diff options
| author | Jan Wieck <JanWieck@Yahoo.com> | 1999-02-08 14:14:32 +0000 |
|---|---|---|
| committer | Jan Wieck <JanWieck@Yahoo.com> | 1999-02-08 14:14:32 +0000 |
| commit | be948af2e81d44290a15a0b8614fdd209924f698 (patch) | |
| tree | 7ea39a552a8cb96e2740a814de3bab7e2b0e04ee /src/backend/tcop/pquery.c | |
| parent | 54e5d256664ece2cb180f4d5a278397906fe5988 (diff) | |
| download | postgresql-be948af2e81d44290a15a0b8614fdd209924f698.tar.gz | |
Added LIMIT/OFFSET functionality including new regression test for it.
Removed CURRENT keyword for rule queries and changed rules regression
accordingly. CURRENT has beed announced to disappear in v6.5.
Jan
Diffstat (limited to 'src/backend/tcop/pquery.c')
| -rw-r--r-- | src/backend/tcop/pquery.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 577a859077..abe3c31a9c 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.19 1998/09/02 23:05:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.20 1999/02/08 14:14:14 wieck Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,8 @@ #include "commands/command.h" static char *CreateOperationTag(int operationType); -static void ProcessQueryDesc(QueryDesc *queryDesc); +static void ProcessQueryDesc(QueryDesc *queryDesc, Node *limoffset, + Node *limcount); /* ---------------------------------------------------------------- @@ -205,7 +206,7 @@ ProcessPortal(char *portalName, * ---------------------------------------------------------------- */ static void -ProcessQueryDesc(QueryDesc *queryDesc) +ProcessQueryDesc(QueryDesc *queryDesc, Node *limoffset, Node *limcount) { Query *parseTree; Plan *plan; @@ -330,7 +331,7 @@ ProcessQueryDesc(QueryDesc *queryDesc) * actually run the plan.. * ---------------- */ - ExecutorRun(queryDesc, state, EXEC_RUN, 0); + ExecutorRun(queryDesc, state, EXEC_RUN, limoffset, limcount); /* save infos for EndCommand */ UpdateCommandInfo(operation, state->es_lastoid, state->es_processed); @@ -373,5 +374,6 @@ ProcessQuery(Query *parsetree, print_plan(plan, parsetree); } else - ProcessQueryDesc(queryDesc); + ProcessQueryDesc(queryDesc, parsetree->limitOffset, + parsetree->limitCount); } |