Change warnings for non-existing or pre-existing cursors to errors.

diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index c86e945a3dc8ea6f419b2e500fd8d46aceba897d..63b2f15d16c0301d266060a5d2bf85b61ca2d964 100644 (file)
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -1,5 +1,5 @@
 
 
@@ -70,10 +70,10 @@ CLOSE cursor
    
 
    
-    WARNING:  PerformPortalClose: portal "cursor" not found
+    ERROR:  cursor "cursor" does not exist
     
      
-      This warning is given if 
+      Message returned if 
       class="PARAMETER">cursor is not declared or has
       already been closed.
      


diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml

index 0aaf0dde43d0038f43fb5df75e011c872ca7e597..14ce71f4a6624562dffbc47d848dad02fbac9090 100644 (file)

--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -1,5 +1,5 @@
 
 
@@ -202,11 +202,10 @@ DECLARE cursorname [ BINARY ] [ INS
    
 
    
-    WARNING:  Closing pre-existing portal "cursorname"
+    ERROR:  cursor "cursorname" already exists
     
      
-      This message is reported if a cursor with the same name already
-      exists. The previous definition is discarded.
+      This error occurs if a cursor with the same name already exists.
      
     
    


diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml

index 305e5fc02ccaa66e2f1c8731fe531d9e055268e8..05960eb2e0fac1a2d39a582e0f056fc4655db745 100644 (file)

--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -1,5 +1,5 @@
 
 
@@ -281,7 +281,7 @@ where direction can be empty or one
 
   
    
-    WARNING:  PerformPortalFetch: portal "cursor" not found
+    ERROR:  cursor "cursor" does not exist
     
      
       There is no cursor with the specified name.


diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c

index c11b48db4c1ad1b803f52069c7477d3c6a23cf8e..27cd7503c30ce4ba1f92454fd269e43e7e43b821 100644 (file)

--- 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 3e51ad2b36c96e493f0fff4d823e93cf42904f54..00bf3e23d2395f586551b7c33177e75f8ac2e34a 100644 (file)

--- 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 245edffe543db67f259d9943be0171f645728b3f..b8f834189823e1462dee43f512058b0744c8854b 100644 (file)

--- 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

diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index 0aaf0dde43d0038f43fb5df75e011c872ca7e597..14ce71f4a6624562dffbc47d848dad02fbac9090 100644 (file)
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -1,5 +1,5 @@
 
 
@@ -202,11 +202,10 @@ DECLARE cursorname [ BINARY ] [ INS
    
 
    
-    WARNING:  Closing pre-existing portal "cursorname"
+    ERROR:  cursor "cursorname" already exists
     
      
-      This message is reported if a cursor with the same name already
-      exists. The previous definition is discarded.
+      This error occurs if a cursor with the same name already exists.
      
     
    

diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index 305e5fc02ccaa66e2f1c8731fe531d9e055268e8..05960eb2e0fac1a2d39a582e0f056fc4655db745 100644 (file)
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -1,5 +1,5 @@
 
 
@@ -281,7 +281,7 @@ where direction can be empty or one
 
   
    
-    WARNING:  PerformPortalFetch: portal "cursor" not found
+    ERROR:  cursor "cursor" does not exist
     
      
       There is no cursor with the specified name.

diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index c11b48db4c1ad1b803f52069c7477d3c6a23cf8e..27cd7503c30ce4ba1f92454fd269e43e7e43b821 100644 (file)
--- 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 3e51ad2b36c96e493f0fff4d823e93cf42904f54..00bf3e23d2395f586551b7c33177e75f8ac2e34a 100644 (file)
--- 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 245edffe543db67f259d9943be0171f645728b3f..b8f834189823e1462dee43f512058b0744c8854b 100644 (file)
--- 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