Accept subsequent commits. This should have been just a warning anyway. I

Michael Meskes · Michael Meskes · commit 2ab3a8887972 · 2002-01-18T15:51:00.000Z
cannot see a reason why it should be an error.
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1207,5 +1207,9 @@ Sat Jan 12 22:04:02 CET 2002
 	- Fixed variable handling for struct members.
 	- Removed check for array input. An attribut might store the
 	  complete array.
+
+Fri Jan 18 16:49:02 CET 2002
+
+	- Accept subsequent commits.
 	- Set ecpg version to 2.9.0.
         - Set library version to 3.3.0.
diff --git a/src/interfaces/ecpg/lib/misc.c b/src/interfaces/ecpg/lib/misc.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.11 2001/12/23 12:17:41 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.12 2002/01/18 15:51:00 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -90,12 +90,17 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
 	/* if we have no connection we just simulate the command */
 	if (con && con->connection)
 	{
-		if ((res = PQexec(con->connection, transaction)) == NULL)
+		/* if we are not in autocommit mode, already have committed 
+		 * the transaction and get another commit, just ignore it */
+		if (!con->committed || con->autocommit)
 		{
-			ECPGraise(lineno, ECPG_TRANS, NULL);
-			return FALSE;
+			if ((res = PQexec(con->connection, transaction)) == NULL)
+			{
+				ECPGraise(lineno, ECPG_TRANS, NULL);
+				return FALSE;
+			}
+			PQclear(res);
 		}
-		PQclear(res);
 	}
 
 	if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.11 2001/12/23 12:17:41 meskes Exp $ */`
	`1`	`+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.12 2002/01/18 15:51:00 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#include "postgres_fe.h"`
`4`	`4`
`@@ -90,12 +90,17 @@ ECPGtrans(int lineno, const char connection_name, const char transaction)`
`90`	`90`	`/* if we have no connection we just simulate the command */`
`91`	`91`	`if (con && con->connection)`
`92`	`92`	`{`
`93`		`- if ((res = PQexec(con->connection, transaction)) == NULL)`
	`93`	`+ /* if we are not in autocommit mode, already have committed`
	`94`	`+ * the transaction and get another commit, just ignore it */`
	`95`	`+ if (!con->committed \|\| con->autocommit)`
`94`	`96`	`{`
`95`		`- ECPGraise(lineno, ECPG_TRANS, NULL);`
`96`		`- return FALSE;`
	`97`	`+ if ((res = PQexec(con->connection, transaction)) == NULL)`
	`98`	`+ {`
	`99`	`+ ECPGraise(lineno, ECPG_TRANS, NULL);`
	`100`	`+ return FALSE;`
	`101`	`+ }`
	`102`	`+ PQclear(res);`
`97`	`103`	`}`
`98`		`- PQclear(res);`
`99`	`104`	`}`
`100`	`105`
`101`	`106`	`if (strcmp(transaction, "commit") == 0 \|\| strcmp(transaction, "rollback") == 0)`