77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.35 1998/09/21 01:02:01 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.36 1998/10/01 01:45:38 tgl Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
508508Pg_result (ClientData cData ,Tcl_Interp * interp ,int argc ,char * argv [])
509509{
510510PGresult * result ;
511- PGconn * conn ;
512511char * opt ;
513512int i ;
514513int tupno ;
@@ -538,24 +537,8 @@ Pg_result(ClientData cData, Tcl_Interp * interp, int argc, char *argv[])
538537}
539538else if (strcmp (opt ,"-error" )== 0 )
540539{
541- switch (PQresultStatus (result )) {
542- case PGRES_EMPTY_QUERY :
543- case PGRES_COMMAND_OK :
544- case PGRES_TUPLES_OK :
545- case PGRES_COPY_OUT :
546- case PGRES_COPY_IN :
547- Tcl_ResetResult (interp );
548- break ;
549- default :
550- if (PgGetConnByResultId (interp ,argv [1 ])!= TCL_OK )
551- return TCL_ERROR ;
552- conn = PgGetConnectionId (interp ,interp -> result ,
553- (Pg_ConnectionId * * )NULL );
554- if (conn == (PGconn * )NULL )
555- return TCL_ERROR ;
556- Tcl_SetResult (interp ,PQerrorMessage (conn ),TCL_VOLATILE );
557- break ;
558- }
540+ Tcl_SetResult (interp , (char * )PQresultErrorMessage (result ),
541+ TCL_STATIC );
559542return TCL_OK ;
560543}
561544else if (strcmp (opt ,"-conn" )== 0 )
@@ -1270,17 +1253,27 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
12701253
12711254if ((result = PQexec (conn ,argv [2 ]))== 0 )
12721255{
1273- /* error occurredduring the query */
1256+ /* error occurredsending the query */
12741257Tcl_SetResult (interp ,PQerrorMessage (conn ),TCL_VOLATILE );
12751258return TCL_ERROR ;
12761259}
12771260
12781261/* Transfer any notify events from libpq to Tcl event queue. */
12791262PgNotifyTransferEvents (connid );
12801263
1264+ if (PQresultStatus (result )!= PGRES_TUPLES_OK )
1265+ {
1266+ /* query failed, or it wasn't SELECT */
1267+ Tcl_SetResult (interp , (char * )PQresultErrorMessage (result ),
1268+ TCL_VOLATILE );
1269+ PQclear (result );
1270+ return TCL_ERROR ;
1271+ }
1272+
12811273if ((info = (struct info_s * )ckalloc (sizeof (* info )* (ncols = PQnfields (result ))))== NULL )
12821274{
12831275Tcl_AppendResult (interp ,"Not enough memory" ,0 );
1276+ PQclear (result );
12841277return TCL_ERROR ;
12851278}
12861279
@@ -1311,7 +1304,10 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
13111304if ((r = Tcl_Eval (interp ,argv [4 ]))!= TCL_OK && r != TCL_CONTINUE )
13121305{
13131306if (r == TCL_BREAK )
1307+ {
1308+ PQclear (result );
13141309return TCL_OK ;
1310+ }
13151311
13161312if (r == TCL_ERROR )
13171313{
@@ -1322,13 +1318,14 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv)
13221318Tcl_AddErrorInfo (interp ,msg );
13231319}
13241320
1321+ PQclear (result );
13251322return r ;
13261323}
13271324}
13281325
13291326ckfree ((void * )info );
13301327Tcl_UnsetVar (interp ,argv [3 ],0 );
1331- Tcl_AppendResult ( interp , "" , 0 );
1328+ PQclear ( result );
13321329return TCL_OK ;
13331330}
13341331
@@ -1352,7 +1349,7 @@ Pg_have_listener (Pg_ConnectionId *connid, const char * relname)
13521349if (interp == NULL )
13531350continue ;/* ignore deleted interpreter */
13541351
1355- entry = Tcl_FindHashEntry (& notifies -> notify_hash ,relname );
1352+ entry = Tcl_FindHashEntry (& notifies -> notify_hash ,( char * ) relname );
13561353if (entry == NULL )
13571354continue ;/* no pg_listen in this interpreter */
13581355