*** empty log message ***

Michael Meskes · Michael Meskes · commit e30c2d67ef1c · 1999-11-22T12:48:48.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -705,3 +705,18 @@ Mon Nov  1 11:22:06 CET 1999
 	- Print SQL error message to STDERR instead of STDOUT.
 	- Added a fourth test source.
 	- Set library version to 3.0.5.
+
+Wed Nov 10 18:33:14 CET 1999
+
+	- Synced preproc.y with gram.y.
+
+Thu Nov 11 07:49:44 CET 1999
+
+	- Fixed bug in SET AUTOCOMMIT.
+
+Mon Nov 22 18:26:34 CET 1999
+
+	- Synced preproc.y with gram.y.
+	- Clean up parser.
+	- Set library version to 3.0.6.
+        - Set ecpg version to 2.6.10.
diff --git a/src/interfaces/ecpg/TODO b/src/interfaces/ecpg/TODO
@@ -7,6 +7,9 @@ has to be 100.
 sqlwarn[6] should be 'W' if the PRECISION or SCALE value specified in a SET
 DESCRIPTOR statement will be ignored.
 
+If a NOTICE message is given by the backend it should not be printed to
+stderr. Instead it should be listed as a warning.
+
 it would be nice to be able to use :var[:index] as cvariable
 
 support for dynamic SQL with unknown number of variables with DESCRIPTORS
@@ -18,6 +21,8 @@ indicator-error?
 
 Add a semantic check level, e.g. check if a table really exists.
 
+How can on insert arrays from c variables?
+
 Missing statements:
  - exec sql ifdef
  - exec sql allocate
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
@@ -6,13 +6,13 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.50 1999/11/02 12:11:53 meskes Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.51 1999/11/22 12:48:46 meskes Exp $
 #
 #-------------------------------------------------------------------------
 
 NAME= ecpg
 SO_MAJOR_VERSION= 3
-SO_MINOR_VERSION= 0.5
+SO_MINOR_VERSION= 0.6
 
 SRCDIR= @top_srcdir@
 include $(SRCDIR)/Makefile.global
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
@@ -84,14 +84,14 @@ struct statement
 	struct variable *outlist;
 };
 
-struct prepared_statement
+static struct prepared_statement
 {
 	char	   *name;
 	struct statement *stmt;
 	struct prepared_statement *next;
 }		   *prep_stmts = NULL;
 
-struct auto_mem
+static struct auto_mem
 {
 	void	   *pointer;
 	struct auto_mem *next;
@@ -656,7 +656,7 @@ ECPGexecute(struct statement * stmt)
 	}
 	else
 	{
-		sqlca.sqlerrd[2] = 0;
+/*		sqlca.sqlerrd[2] = 0;*/
 		var = stmt->outlist;
 		switch (PQresultStatus(results))
 		{
@@ -741,7 +741,7 @@ ECPGexecute(struct statement * stmt)
 
 					for (act_tuple = 0; act_tuple < ntuples && status; act_tuple++)
 					{
-						pval = PQgetvalue(results, act_tuple, act_field);
+						pval = (char *)PQgetvalue(results, act_tuple, act_field);
 
 						ECPGlog("ECPGexecute line %d: RESULT: %s\n", stmt->lineno, pval ? pval : "");
 
@@ -1112,6 +1112,7 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
 		}
 		PQclear(res);
 	}
+	
 	if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
 	{
 		struct prepared_statement *this;
@@ -1140,7 +1141,9 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 	if (!ecpg_init(con, connection_name, lineno))
 		return(false);
 
-	if (con->autocommit == true && strncmp(mode, "OFF", strlen("OFF")) == 0)
+	ECPGlog("ECPGsetcommit line %d action = %s connection = %s\n", lineno, mode, con->name);
+	
+	if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)
 	{
 		if (con->committed)
 		{
@@ -1154,7 +1157,7 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 		}
 		con->autocommit = false;
 	}
-	else if (con->autocommit == false && strncmp(mode, "ON", strlen("ON")) == 0)
+	else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)
 	{
 		if (!con->committed)
 		{
@@ -1213,8 +1216,6 @@ ECPGconnect(int lineno, const char *dbname, const char *user, const char *passwd
 
 	ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "<DEFAULT>", user ? "for user " : "", user ? user : "");
 
-	sqlca.sqlcode = 0;
-
 	this->connection = PQsetdbLogin(NULL, NULL, NULL, NULL, dbname, user, passwd);
 
 	if (PQstatus(this->connection) == CONNECTION_BAD)
@@ -1238,6 +1239,7 @@ ECPGdisconnect(int lineno, const char *connection_name)
 
 	if (strcmp(connection_name, "ALL") == 0)
 	{
+		memcpy((char *) &sqlca, (char *) &sqlca_init, sizeof(sqlca));
 		for (con = all_connections; con;)
 		{
 			struct connection *f = con;
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
 
 MAJOR_VERSION=2
 MINOR_VERSION=6
-PATCHLEVEL=9
+PATCHLEVEL=10
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
diff --git a/src/interfaces/ecpg/test/test4.pgc b/src/interfaces/ecpg/test/test4.pgc

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`	`# Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.50 1999/11/02 12:11:53 meskes Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.51 1999/11/22 12:48:46 meskes Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`13`	`13`	`NAME= ecpg`
`14`	`14`	`SO_MAJOR_VERSION= 3`
`15`		`-SO_MINOR_VERSION= 0.5`
	`15`	`+SO_MINOR_VERSION= 0.6`
`16`	`16`
`17`	`17`	`SRCDIR= @top_srcdir@`
`18`	`18`	`include $(SRCDIR)/Makefile.global`
Original file line number	Diff line number	Diff line change
`@@ -84,14 +84,14 @@ struct statement`
`84`	`84`	`struct variable *outlist;`
`85`	`85`	`};`
`86`	`86`
`87`		`-struct prepared_statement`
	`87`	`+static struct prepared_statement`
`88`	`88`	`{`
`89`	`89`	`char *name;`
`90`	`90`	`struct statement *stmt;`
`91`	`91`	`struct prepared_statement *next;`
`92`	`92`	`} *prep_stmts = NULL;`
`93`	`93`
`94`		`-struct auto_mem`
	`94`	`+static struct auto_mem`
`95`	`95`	`{`
`96`	`96`	`void *pointer;`
`97`	`97`	`struct auto_mem *next;`
`@@ -656,7 +656,7 @@ ECPGexecute(struct statement * stmt)`
`656`	`656`	`}`
`657`	`657`	`else`
`658`	`658`	`{`
`659`		`- sqlca.sqlerrd[2] = 0;`
	`659`	`+/* sqlca.sqlerrd[2] = 0;*/`
`660`	`660`	`var = stmt->outlist;`
`661`	`661`	`switch (PQresultStatus(results))`
`662`	`662`	`{`
`@@ -741,7 +741,7 @@ ECPGexecute(struct statement * stmt)`
`741`	`741`
`742`	`742`	`for (act_tuple = 0; act_tuple < ntuples && status; act_tuple++)`
`743`	`743`	`{`
`744`		`- pval = PQgetvalue(results, act_tuple, act_field);`
	`744`	`+ pval = (char *)PQgetvalue(results, act_tuple, act_field);`
`745`	`745`
`746`	`746`	`ECPGlog("ECPGexecute line %d: RESULT: %s\n", stmt->lineno, pval ? pval : "");`
`747`	`747`
`@@ -1112,6 +1112,7 @@ ECPGtrans(int lineno, const char connection_name, const char transaction)`
`1112`	`1112`	`}`
`1113`	`1113`	`PQclear(res);`
`1114`	`1114`	`}`
	`1115`	`+`
`1115`	`1116`	`if (strcmp(transaction, "commit") == 0 \|\| strcmp(transaction, "rollback") == 0)`
`1116`	`1117`	`{`
`1117`	`1118`	`struct prepared_statement *this;`
`@@ -1140,7 +1141,9 @@ ECPGsetcommit(int lineno, const char mode, const char connection_name)`
`1140`	`1141`	`if (!ecpg_init(con, connection_name, lineno))`
`1141`	`1142`	`return(false);`
`1142`	`1143`
`1143`		`- if (con->autocommit == true && strncmp(mode, "OFF", strlen("OFF")) == 0)`
	`1144`	`+ ECPGlog("ECPGsetcommit line %d action = %s connection = %s\n", lineno, mode, con->name);`
	`1145`	`+`
	`1146`	`+ if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)`
`1144`	`1147`	`{`
`1145`	`1148`	`if (con->committed)`
`1146`	`1149`	`{`
`@@ -1154,7 +1157,7 @@ ECPGsetcommit(int lineno, const char mode, const char connection_name)`
`1154`	`1157`	`}`
`1155`	`1158`	`con->autocommit = false;`
`1156`	`1159`	`}`
`1157`		`- else if (con->autocommit == false && strncmp(mode, "ON", strlen("ON")) == 0)`
	`1160`	`+ else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)`
`1158`	`1161`	`{`
`1159`	`1162`	`if (!con->committed)`
`1160`	`1163`	`{`
`@@ -1213,8 +1216,6 @@ ECPGconnect(int lineno, const char dbname, const char user, const char *passwd`
`1213`	`1216`
`1214`	`1217`	`ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "<DEFAULT>", user ? "for user " : "", user ? user : "");`
`1215`	`1218`
`1216`		`- sqlca.sqlcode = 0;`
`1217`		`-`
`1218`	`1219`	`this->connection = PQsetdbLogin(NULL, NULL, NULL, NULL, dbname, user, passwd);`
`1219`	`1220`
`1220`	`1221`	`if (PQstatus(this->connection) == CONNECTION_BAD)`
`@@ -1238,6 +1239,7 @@ ECPGdisconnect(int lineno, const char *connection_name)`
`1238`	`1239`
`1239`	`1240`	`if (strcmp(connection_name, "ALL") == 0)`
`1240`	`1241`	`{`
	`1242`	`+ memcpy((char ) &sqlca, (char ) &sqlca_init, sizeof(sqlca));`
`1241`	`1243`	`for (con = all_connections; con;)`
`1242`	`1244`	`{`
`1243`	`1245`	`struct connection *f = con;`