GH-15750 Pdo\Pgsql with ATTR_PREFETCH = 0: handle handle's internal queries

not only the statements, but the driver, love to make internal queries. We make sure no unfinished query still runs when having to pass an internal one.

Author: outtersg

ext/pdo_pgsql/pgsql_driver.c

@@ -36,6 +36,7 @@
 #include "pgsql_driver_arginfo.h"
 
 static bool pgsql_handle_in_transaction(pdo_dbh_t *dbh);
+void pgsql_stmt_finish(pdo_pgsql_stmt *S, int fin_mode);
 
 static char * _pdo_pgsql_trim_message(const char *message, int persistent)
 {
@@ -103,6 +104,13 @@ int _pdo_pgsql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, int errcode, const char *
 }
 /* }}} */
 
+static zend_always_inline void pgsql_finish_running_stmt(pdo_pgsql_db_handle *H)
+{
+	if (H->running_stmt && H->running_stmt->is_running_unbuffered) {
+		pgsql_stmt_finish(H->running_stmt, 0);
+	}
+}
+
 static void _pdo_pgsql_notice(void *context, const char *message) /* {{{ */
 {
 	pdo_dbh_t * dbh = (pdo_dbh_t *)context;
@@ -348,6 +356,7 @@ static zend_long pgsql_handle_doer(pdo_dbh_t *dbh, const zend_string *sql)
 
 	bool in_trans = pgsql_handle_in_transaction(dbh);
 
+	pgsql_finish_running_stmt(H);
 	if (!(res = PQexec(H->server, ZSTR_VAL(sql)))) {
 		/* fatal error */
 		pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, NULL);
@@ -415,6 +424,7 @@ static zend_string *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const zend_string *
 	PGresult *res;
 	ExecStatusType status;
 
+	pgsql_finish_running_stmt(H);
 	if (name == NULL) {
 		res = PQexec(H->server, "SELECT LASTVAL()");
 	} else {
@@ -578,6 +588,7 @@ static bool pdo_pgsql_transaction_cmd(const char *cmd, pdo_dbh_t *dbh)
 	PGresult *res;
 	bool ret = true;
 
+	pgsql_finish_running_stmt(H);
 	res = PQexec(H->server, cmd);
 
 	if (PQresultStatus(res) != PGRES_COMMAND_OK) {
@@ -686,6 +697,7 @@ void pgsqlCopyFromArray_internal(INTERNAL_FUNCTION_PARAMETERS)
 	while ((pgsql_result = PQgetResult(H->server))) {
 		PQclear(pgsql_result);
 	}
+	pgsql_finish_running_stmt(H); /* Maybe in the future combine with the getResult loop in a pgsql_consume_running_stmt */
 	pgsql_result = PQexec(H->server, query);
 
 	efree(query);
@@ -810,6 +822,7 @@ void pgsqlCopyFromFile_internal(INTERNAL_FUNCTION_PARAMETERS)
 	while ((pgsql_result = PQgetResult(H->server))) {
 		PQclear(pgsql_result);
 	}
+	pgsql_finish_running_stmt(H); /* Maybe in the future combine with the getResult loop in a pgsql_consume_running_stmt */
 	pgsql_result = PQexec(H->server, query);
 
 	efree(query);
@@ -906,6 +919,7 @@ void pgsqlCopyToFile_internal(INTERNAL_FUNCTION_PARAMETERS)
 	while ((pgsql_result = PQgetResult(H->server))) {
 		PQclear(pgsql_result);
 	}
+	pgsql_finish_running_stmt(H); /* Maybe in the future combine with the getResult loop in a pgsql_consume_running_stmt */
 
 	/* using pre-9.0 syntax as PDO_pgsql is 7.4+ compatible */
 	if (pg_fields) {
@@ -997,6 +1011,7 @@ void pgsqlCopyToArray_internal(INTERNAL_FUNCTION_PARAMETERS)
 	while ((pgsql_result = PQgetResult(H->server))) {
 		PQclear(pgsql_result);
 	}
+	pgsql_finish_running_stmt(H); /* Maybe in the future combine with the getResult loop in a pgsql_consume_running_stmt */
 
 	/* using pre-9.0 syntax as PDO_pgsql is 7.4+ compatible */
 	if (pg_fields) {

ext/pdo_pgsql/pgsql_statement.c

@@ -62,7 +62,7 @@
 
 
 
-static void pgsql_stmt_finish(pdo_pgsql_stmt *S, int fin_mode)
+void pgsql_stmt_finish(pdo_pgsql_stmt *S, int fin_mode)
 {
 	pdo_pgsql_db_handle *H = S->H;