Applied patch by Itagaki Takahiro to fix incorrect status calculation in

Michael Meskes · Michael Meskes · commit 816b008eaf1a · 2010-10-14T17:55:07.000+02:00
ecpglib. Instead of parsing the statement just as ask the database server. This
patch removes the whole client side track keeping of the current transaction
status.
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
@@ -167,25 +167,23 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 
 	if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)
 	{
-		if (con->committed)
+		if (PQtransactionStatus(con->connection) == PQTRANS_IDLE)
 		{
 			results = PQexec(con->connection, "begin transaction");
 			if (!ecpg_check_PQresult(results, lineno, con->connection, ECPG_COMPAT_PGSQL))
 				return false;
 			PQclear(results);
-			con->committed = false;
 		}
 		con->autocommit = false;
 	}
 	else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)
 	{
-		if (!con->committed)
+		if (PQtransactionStatus(con->connection) != PQTRANS_IDLE)
 		{
 			results = PQexec(con->connection, "commit");
 			if (!ecpg_check_PQresult(results, lineno, con->connection, ECPG_COMPAT_PGSQL))
 				return false;
 			PQclear(results);
-			con->committed = true;
 		}
 		con->autocommit = true;
 	}
@@ -540,7 +538,6 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
 	pthread_mutex_unlock(&connections_mutex);
 #endif
 
-	this->committed = true;
 	this->autocommit = autocommit;
 
 	PQsetNoticeReceiver(this->connection, &ECPGnoticeReceiver, (void *) this);
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1427,7 +1427,7 @@ ecpg_execute(struct statement * stmt)
 
 	/* The request has been build. */
 
-	if (stmt->connection->committed && !stmt->connection->autocommit)
+	if (PQtransactionStatus(stmt->connection->connection) == PQTRANS_IDLE && !stmt->connection->autocommit)
 	{
 		results = PQexec(stmt->connection->connection, "begin transaction");
 		if (!ecpg_check_PQresult(results, stmt->lineno, stmt->connection->connection, stmt->compat))
@@ -1436,7 +1436,6 @@ ecpg_execute(struct statement * stmt)
 			return false;
 		}
 		PQclear(results);
-		stmt->connection->committed = false;
 	}
 
 	ecpg_log("ecpg_execute on line %d: query: %s; with %d parameter(s) on connection %s\n", stmt->lineno, stmt->command, nParams, stmt->connection->name);
diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/extern.h
@@ -76,7 +76,6 @@ struct connection
 {
 	char	   *name;
 	PGconn	   *connection;
-	bool		committed;
 	int			autocommit;
 	struct ECPGtype_information_cache *cache_head;
 	struct prepared_statement *prep_stmts;
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
@@ -206,7 +206,7 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
 		 * developers have to take care themselves. However, if the command is
 		 * a begin statement, we just execute it once.
 		 */
-		if (con->committed && !con->autocommit && strncmp(transaction, "begin", 5) != 0 && strncmp(transaction, "start", 5) != 0)
+		if (PQtransactionStatus(con->connection) == PQTRANS_IDLE && !con->autocommit && strncmp(transaction, "begin", 5) != 0 && strncmp(transaction, "start", 5) != 0)
 		{
 			res = PQexec(con->connection, "begin transaction");
 			if (!ecpg_check_PQresult(res, lineno, con->connection, ECPG_COMPAT_PGSQL))
@@ -218,11 +218,6 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
 		if (!ecpg_check_PQresult(res, lineno, con->connection, ECPG_COMPAT_PGSQL))
 			return FALSE;
 		PQclear(res);
-
-		if (strncmp(transaction, "commit", 6) == 0 || strncmp(transaction, "rollback", 8) == 0)
-			con->committed = true;
-		else
-			con->committed = false;
 	}
 
 	return true;

Original file line number	Diff line number	Diff line change
`@@ -167,25 +167,23 @@ ECPGsetcommit(int lineno, const char mode, const char connection_name)`
`167`	`167`
`168`	`168`	`if (con->autocommit == true && strncmp(mode, "off", strlen("off")) == 0)`
`169`	`169`	`{`
`170`		`- if (con->committed)`
	`170`	`+ if (PQtransactionStatus(con->connection) == PQTRANS_IDLE)`
`171`	`171`	`{`
`172`	`172`	`results = PQexec(con->connection, "begin transaction");`
`173`	`173`	`if (!ecpg_check_PQresult(results, lineno, con->connection, ECPG_COMPAT_PGSQL))`
`174`	`174`	`return false;`
`175`	`175`	`PQclear(results);`
`176`		`- con->committed = false;`
`177`	`176`	`}`
`178`	`177`	`con->autocommit = false;`
`179`	`178`	`}`
`180`	`179`	`else if (con->autocommit == false && strncmp(mode, "on", strlen("on")) == 0)`
`181`	`180`	`{`
`182`		`- if (!con->committed)`
	`181`	`+ if (PQtransactionStatus(con->connection) != PQTRANS_IDLE)`
`183`	`182`	`{`
`184`	`183`	`results = PQexec(con->connection, "commit");`
`185`	`184`	`if (!ecpg_check_PQresult(results, lineno, con->connection, ECPG_COMPAT_PGSQL))`
`186`	`185`	`return false;`
`187`	`186`	`PQclear(results);`
`188`		`- con->committed = true;`
`189`	`187`	`}`
`190`	`188`	`con->autocommit = true;`
`191`	`189`	`}`
`@@ -540,7 +538,6 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`540`	`538`	`pthread_mutex_unlock(&connections_mutex);`
`541`	`539`	`#endif`
`542`	`540`
`543`		`- this->committed = true;`
`544`	`541`	`this->autocommit = autocommit;`
`545`	`542`
`546`	`543`	`PQsetNoticeReceiver(this->connection, &ECPGnoticeReceiver, (void *) this);`
Original file line number	Diff line number	Diff line change
`@@ -1427,7 +1427,7 @@ ecpg_execute(struct statement * stmt)`
`1427`	`1427`
`1428`	`1428`	`/* The request has been build. */`
`1429`	`1429`
`1430`		`- if (stmt->connection->committed && !stmt->connection->autocommit)`
	`1430`	`+ if (PQtransactionStatus(stmt->connection->connection) == PQTRANS_IDLE && !stmt->connection->autocommit)`
`1431`	`1431`	`{`
`1432`	`1432`	`results = PQexec(stmt->connection->connection, "begin transaction");`
`1433`	`1433`	`if (!ecpg_check_PQresult(results, stmt->lineno, stmt->connection->connection, stmt->compat))`
`@@ -1436,7 +1436,6 @@ ecpg_execute(struct statement * stmt)`
`1436`	`1436`	`return false;`
`1437`	`1437`	`}`
`1438`	`1438`	`PQclear(results);`
`1439`		`- stmt->connection->committed = false;`
`1440`	`1439`	`}`
`1441`	`1440`
`1442`	`1441`	`ecpg_log("ecpg_execute on line %d: query: %s; with %d parameter(s) on connection %s\n", stmt->lineno, stmt->command, nParams, stmt->connection->name);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ struct connection`
`76`	`76`	`{`
`77`	`77`	`char *name;`
`78`	`78`	`PGconn *connection;`
`79`		`- bool committed;`
`80`	`79`	`int autocommit;`
`81`	`80`	`struct ECPGtype_information_cache *cache_head;`
`82`	`81`	`struct prepared_statement *prep_stmts;`