Make sure each call to ECPGraise is logged.

src/interfaces/ecpg/ChangeLog

@@ -1116,5 +1116,9 @@ TUe Okt  2 16:09:26 CEST 2001
 Fri Okt  5 08:37:01 CEST 2001
 
 	- Fixed yet another typo in preproc.y.
+
+Fri Okt  5 19:33:46 CEST 2001
+
+	- Make sure every call to ECPGraise is logged.
 	- Set ecpg version to 2.9.0.
         - Set library version to 3.3.0.

src/interfaces/ecpg/lib/data.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.16 2001/10/01 12:02:28 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.17 2001/10/05 17:37:07 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -27,7 +27,6 @@ get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 	{
 		if (*pval != '{')
 		{
-			ECPGlog("get_data: data entry does not look like an array in line %d\n", lineno);
 			ECPGraise(lineno, ECPG_DATA_NOT_ARRAY, NULL);
 			return (false);
 		}

src/interfaces/ecpg/lib/error.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/error.c,v 1.10 2001/09/19 14:09:32 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/error.c,v 1.11 2001/10/05 17:37:07 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -89,12 +89,12 @@ ECPGraise(int line, int code, const char *str)
 
 		case ECPG_NOT_CONN:
 			snprintf(sqlca.sqlerrm.sqlerrmc, sizeof(sqlca.sqlerrm.sqlerrmc),
-					 "Not connected in line %d.", line);
+					 "Not connected to '%s' in line %d.", str, line);
 			break;
 
 		case ECPG_INVALID_STMT:
 			snprintf(sqlca.sqlerrm.sqlerrmc, sizeof(sqlca.sqlerrm.sqlerrmc),
-					 "Invalid statement name in line %d.", line);
+					 "Invalid statement name %s in line %d.", str, line);
 			break;
 
 		case ECPG_UNKNOWN_DESCRIPTOR:
@@ -151,6 +151,7 @@ ECPGraise(int line, int code, const char *str)
 	}
 
 	sqlca.sqlerrm.sqlerrml = strlen(sqlca.sqlerrm.sqlerrmc);
+	ECPGlog("raising sqlcode %d in line %d, '%s'.\n", code, line, sqlca.sqlerrm.sqlerrmc);
 
 	/* free all memory we have allocated for the user */
 	free_auto_mem();

src/interfaces/ecpg/lib/execute.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.27 2001/10/02 14:08:28 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.28 2001/10/05 17:37:07 meskes Exp $ */
 
 /*
  * The aim is to get a simpler inteface to the database routines.
@@ -182,7 +182,6 @@ create_statement(int lineno, struct connection * connection, struct statement **
 			/* if variable is NULL, the statement hasn't been prepared */
 			if (var->pointer == NULL)
 			{
-				ECPGlog("create_statement: invalid statement name\n");
 				ECPGraise(lineno, ECPG_INVALID_STMT, NULL);
 				free(var);
 				return false;
@@ -405,7 +404,6 @@ ECPGstore_result(const PGresult *results, int act_field,
 						 */
 						if (var->arrsize == 0)
 						{
-							ECPGlog("ECPGexecute line %d: variable is not an array\n");
 							ECPGraise(stmt->lineno, ECPG_NO_ARRAY, NULL);
 							return false;
 						}
@@ -942,7 +940,7 @@ ECPGexecute(struct statement * stmt)
 
 				if (ntuples < 1)
 				{
-					ECPGlog("ECPGexecute line %d: Incorrect number of matches: %d\n",
+					if (ntuples) ECPGlog("ECPGexecute line %d: Incorrect number of matches: %d\n",
 							stmt->lineno, ntuples);
 					ECPGraise(stmt->lineno, ECPG_NOT_FOUND, NULL);
 					status = false;
@@ -957,7 +955,7 @@ ECPGexecute(struct statement * stmt)
 				    		PQclear(*resultpp);
 						*resultpp=results;
 						clear_result = FALSE;
-						ECPGlog("ECPGexecute putting result into descriptor '%s'\n", (const char*)var->pointer);
+						ECPGlog("ECPGexecute putting result (%d tuples) into descriptor '%s'\n", PQntuples(results), (const char*)var->pointer);
 					}
 					var = var->next;
 				}
@@ -965,7 +963,6 @@ ECPGexecute(struct statement * stmt)
 				{
 					if (var == NULL)
 					{
-						ECPGlog("ECPGexecute line %d: Too few arguments.\n", stmt->lineno);
 						ECPGraise(stmt->lineno, ECPG_TOO_FEW_ARGUMENTS, NULL);
 						return (false);
 					}
@@ -1068,8 +1065,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
 	if (con == NULL || con->connection == NULL)
 	{
 		free_statement(stmt);
-		ECPGlog("ECPGdo: not connected to %s\n", con->name);
-		ECPGraise(lineno, ECPG_NOT_CONN, NULL);
+		ECPGraise(lineno, ECPG_NOT_CONN, (con) ? con->name : "<empty>");
 		setlocale(LC_NUMERIC, oldlocale);
 		free(oldlocale);
 		return false;

src/interfaces/ecpg/lib/memory.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/memory.c,v 1.5 2001/09/19 14:09:32 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/memory.c,v 1.6 2001/10/05 17:37:07 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -14,7 +14,6 @@ ecpg_alloc(long size, int lineno)
 
 	if (!new)
 	{
-		ECPGlog("out of memory\n");
 		ECPGraise(lineno, ECPG_OUT_OF_MEMORY, NULL);
 		return NULL;
 	}
@@ -30,7 +29,6 @@ ecpg_strdup(const char *string, int lineno)
 
 	if (!new)
 	{
-		ECPGlog("out of memory\n");
 		ECPGraise(lineno, ECPG_OUT_OF_MEMORY, NULL);
 		return NULL;
 	}

src/interfaces/ecpg/lib/misc.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.5 2001/09/19 14:09:32 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.6 2001/10/05 17:37:07 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -54,8 +54,7 @@ ECPGstatus(int lineno, const char *connection_name)
 	/* are we connected? */
 	if (con->connection == NULL)
 	{
-		ECPGlog("ECPGdo: not connected to %s\n", con->name);
-		ECPGraise(lineno, ECPG_NOT_CONN, NULL);
+		ECPGraise(lineno, ECPG_NOT_CONN, con->name);
 		return false;
 	}
 

src/interfaces/ecpg/lib/prepare.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.7 2001/09/19 14:09:32 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.8 2001/10/05 17:37:07 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -125,7 +125,6 @@ ECPGdeallocate(int lineno, char *name)
 		free(this);
 		return true;
 	}
-	ECPGlog("deallocate_prepare: invalid statement name %s\n", name);
 	ECPGraise(lineno, ECPG_INVALID_STMT, name);
 	return false;
 }