Added Christof's patches.

Author: Michael Meskes

src/interfaces/ecpg/ChangeLog

@@ -1146,5 +1146,9 @@ Sun Oct 21 14:19:42 CEST 2001
 Fri Nov  2 16:16:25 CET 2001
 
 	- Synced preproc.y with gram.y.
+
+Wed Nov 14 11:50:27 CET 2001
+
+	- Added several patches by Christof Petig <christof.petig@wtal.de>.
 	- Set ecpg version to 2.9.0.
         - Set library version to 3.3.0.

src/interfaces/ecpg/README.dynSQL

@@ -1,20 +1,10 @@
 descriptor statements have the following shortcomings
 
-- up to now the only reasonable statement is
-	FETCH ... INTO SQL DESCRIPTOR <name>
-  no input variables allowed!
+- input descriptors (USING DESCRIPTOR <name>) are not supported
 
   Reason: to fully support dynamic SQL the frontend/backend communication
   	should change to recognize input parameters.
   	Since this is not likely to happen in the near future and you
   	can cover the same functionality with the existing infrastructure
-  	I'll leave the work to someone else.
-
-- string buffer overflow does not always generate warnings 
-	(beware: terminating 0 may be missing because strncpy is used)
-	:var=data sets sqlwarn accordingly (but not indicator)
-
-- char variables pointing to NULL are not allocated on demand
-	
-- string truncation does not show up in indicator
+  	(using s[n]printf), I'll leave the work to someone else.
 

src/interfaces/ecpg/include/ecpglib.h

@@ -67,6 +67,8 @@ void		ECPGraise(int line, int code, const char *str);
 bool		ECPGget_desc_header(int, char *, int *);
 bool		ECPGget_desc(int, char *, int,...);
 
+/* dynamic result allocation */
+	void		ECPGfree_auto_mem(void);
 
 #ifdef __cplusplus
 }

src/interfaces/ecpg/lib/connect.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/connect.c,v 1.14 2001/10/31 04:49:44 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/connect.c,v 1.15 2001/11/14 11:11:49 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -12,7 +12,7 @@ static struct connection *all_connections = NULL,
 		   *actual_connection = NULL;
 
 struct connection *
-get_connection(const char *connection_name)
+ECPGget_connection(const char *connection_name)
 {
 	struct connection *con = all_connections;
 
@@ -63,10 +63,10 @@ ecpg_finish(struct connection * act)
 bool
 ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 {
-	struct connection *con = get_connection(connection_name);
+	struct connection *con = ECPGget_connection(connection_name);
 	PGresult   *results;
 
-	if (!ecpg_init(con, connection_name, lineno))
+	if (!ECPGinit(con, connection_name, lineno))
 		return (false);
 
 	ECPGlog("ECPGsetcommit line %d action = %s connection = %s\n", lineno, mode, con->name);
@@ -106,9 +106,9 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 bool
 ECPGsetconn(int lineno, const char *connection_name)
 {
-	struct connection *con = get_connection(connection_name);
+	struct connection *con = ECPGget_connection(connection_name);
 
-	if (!ecpg_init(con, connection_name, lineno))
+	if (!ECPGinit(con, connection_name, lineno))
 		return (false);
 
 	actual_connection = con;
@@ -269,9 +269,9 @@ ECPGconnect(int lineno, const char *name, const char *user, const char *passwd,
 			   *realname = NULL,
 			   *options = NULL;
 
-	init_sqlca();
+	ECPGinit_sqlca();
 
-	if ((this = (struct connection *) ecpg_alloc(sizeof(struct connection), lineno)) == NULL)
+	if ((this = (struct connection *) ECPGalloc(sizeof(struct connection), lineno)) == NULL)
 		return false;
 
 	if (dbname == NULL && connection_name == NULL)
@@ -393,9 +393,9 @@ ECPGconnect(int lineno, const char *name, const char *user, const char *passwd,
 
 	/* add connection to our list */
 	if (connection_name != NULL)
-		this->name = ecpg_strdup(connection_name, lineno);
+		this->name = ECPGstrdup(connection_name, lineno);
 	else
-		this->name = ecpg_strdup(realname, lineno);
+		this->name = ECPGstrdup(realname, lineno);
 
 	this->cache_head = NULL;
 
@@ -465,7 +465,7 @@ ECPGdisconnect(int lineno, const char *connection_name)
 
 	if (strcmp(connection_name, "ALL") == 0)
 	{
-		init_sqlca();
+		ECPGinit_sqlca();
 		for (con = all_connections; con;)
 		{
 			struct connection *f = con;
@@ -476,9 +476,9 @@ ECPGdisconnect(int lineno, const char *connection_name)
 	}
 	else
 	{
-		con = get_connection(connection_name);
+		con = ECPGget_connection(connection_name);
 
-		if (!ecpg_init(con, connection_name, lineno))
+		if (!ECPGinit(con, connection_name, lineno))
 			return (false);
 		else
 			ecpg_finish(con);

src/interfaces/ecpg/lib/data.c

@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.18 2001/11/05 17:46:37 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.19 2001/11/14 11:11:49 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -12,14 +12,14 @@
 #include "sqlca.h"
 
 bool
-get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
+ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 		 enum ECPGttype type, enum ECPGttype ind_type,
 		 void *var, void *ind, long varcharsize, long offset,
 		 bool isarray)
 {
 	char	   *pval = (char *) PQgetvalue(results, act_tuple, act_field);
 
-	ECPGlog("get_data line %d: RESULT: %s\n", lineno, pval ? pval : "");
+	ECPGlog("ECPGget_data line %d: RESULT: %s\n", lineno, pval ? pval : "");
 
 	/* pval is a pointer to the value */
 	/* let's check is it really is an array if it should be one */