diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-04-29 03:21:30 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-04-29 03:21:30 +0000 |
| commit | 4a5f38c4e624fbdc8bb4511394c45dc2c7f784ec (patch) | |
| tree | 715c7e2440e4616e6084b6348453ad379733e9c9 /src/backend/parser | |
| parent | 6a17d226b535c1fc7db8a10b5f2b482e852af928 (diff) | |
| download | postgresql-4a5f38c4e624fbdc8bb4511394c45dc2c7f784ec.tar.gz | |
Code review for holdable-cursors patch. Fix error recovery, memory
context sloppiness, some other things. Includes Neil's mopup patch
of 22-Apr.
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/analyze.c | 4 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 64cd5603ac..5dc3d82bea 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.266 2003/03/27 16:51:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.267 2003/04/29 03:21:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2299,7 +2299,7 @@ transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt) */ if ((stmt->options & CURSOR_OPT_SCROLL) && (stmt->options & CURSOR_OPT_NO_SCROLL)) - elog(ERROR, "Both SCROLL and NO SCROLL cannot be specified."); + elog(ERROR, "Cannot specify both SCROLL and NO SCROLL"); stmt->query = (Node *) transformStmt(pstate, stmt->query, &extras_before, &extras_after); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 5e98788765..bd67dae811 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.411 2003/04/08 23:20:01 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.412 2003/04/29 03:21:29 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -4236,10 +4236,8 @@ DeclareCursorStmt: DECLARE name cursor_options CURSOR opt_hold FOR SelectStmt n->portalname = $2; n->options = $3; n->query = $7; - if ($5) n->options |= CURSOR_OPT_HOLD; - $$ = (Node *)n; } ; @@ -7191,6 +7189,7 @@ unreserved_keyword: | FUNCTION | GLOBAL | HANDLER + | HOLD | HOUR_P | IMMEDIATE | IMMUTABLE |