diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-08-24 21:02:43 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-08-24 21:02:43 +0000 |
| commit | 693aad413b16aac85fb9a4e792d84cd87778aa9e (patch) | |
| tree | c97d16baac063b5d552f26ca2028372ad9e04e90 /src | |
| parent | c3664c0c007931102727a016208ca604123622e0 (diff) | |
| download | postgresql-693aad413b16aac85fb9a4e792d84cd87778aa9e.tar.gz postgresql-693aad413b16aac85fb9a4e792d84cd87778aa9e.zip | |
Change warnings for non-existing or pre-existing cursors to errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/portalcmds.c | 23 | ||||
| -rw-r--r-- | src/backend/utils/mmgr/portalmem.c | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/portals.out | 2 |
3 files changed, 13 insertions, 18 deletions
diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index c11b48db4c1..27cd7503c30 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/portalcmds.c,v 1.23 2003/08/08 21:41:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/portalcmds.c,v 1.24 2003/08/24 21:02:43 petere Exp $ * *------------------------------------------------------------------------- */ @@ -88,10 +88,9 @@ PerformCursorOpen(DeclareCursorStmt *stmt) /* * Create a portal and copy the query and plan into its memory - * context. (If a duplicate cursor name already exists, warn and drop - * it.) + * context. */ - portal = CreatePortal(stmt->portalname, true, false); + portal = CreatePortal(stmt->portalname, false, false); oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal)); @@ -168,13 +167,10 @@ PerformPortalFetch(FetchStmt *stmt, portal = GetPortalByName(stmt->portalname); if (!PortalIsValid(portal)) { - /* FIXME: shouldn't this be an ERROR? */ - ereport(WARNING, + ereport(ERROR, (errcode(ERRCODE_UNDEFINED_CURSOR), - errmsg("portal \"%s\" does not exist", stmt->portalname))); - if (completionTag) - strcpy(completionTag, stmt->ismove ? "MOVE 0" : "FETCH 0"); - return; + errmsg("cursor \"%s\" does not exist", stmt->portalname))); + return; /* keep compiler happy */ } /* Adjust dest if needed. MOVE wants destination None */ @@ -218,11 +214,10 @@ PerformPortalClose(const char *name) portal = GetPortalByName(name); if (!PortalIsValid(portal)) { - ereport(WARNING, + ereport(ERROR, (errcode(ERRCODE_UNDEFINED_CURSOR), - errmsg("portal \"%s\" does not exist", name), - errfunction("PerformPortalClose"))); /* for ecpg */ - return; + errmsg("cursor \"%s\" does not exist", name))); + return; /* keep compiler happy */ } /* diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 3e51ad2b36c..00bf3e23d23 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.61 2003/08/04 02:40:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.62 2003/08/24 21:02:43 petere Exp $ * *------------------------------------------------------------------------- */ @@ -167,11 +167,11 @@ CreatePortal(const char *name, bool allowDup, bool dupSilent) if (!allowDup) ereport(ERROR, (errcode(ERRCODE_DUPLICATE_CURSOR), - errmsg("portal \"%s\" already exists", name))); + errmsg("cursor \"%s\" already exists", name))); if (!dupSilent) ereport(WARNING, (errcode(ERRCODE_DUPLICATE_CURSOR), - errmsg("closing pre-existing portal \"%s\"", + errmsg("closing existing cursor \"%s\"", name))); PortalDrop(portal, false); } diff --git a/src/test/regress/expected/portals.out b/src/test/regress/expected/portals.out index 245edffe543..b8f83418982 100644 --- a/src/test/regress/expected/portals.out +++ b/src/test/regress/expected/portals.out @@ -737,4 +737,4 @@ DECLARE foo26 CURSOR WITH HOLD FOR SELECT * FROM tenk1; ROLLBACK; -- should fail FETCH FROM foo26; -WARNING: portal "foo26" does not exist +ERROR: cursor "foo26" does not exist |