Boolify PDO's transaction handlers

Girgias · Girgias · commit d04adf60bee3 · 2021-01-06T10:20:57.000Z
This includes begin(), commit(), rollBack(), and inTransaction()
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
@@ -578,7 +578,7 @@ PHP_METHOD(PDO, prepare)
 /* }}} */
 
 
-static zend_bool pdo_is_in_transaction(pdo_dbh_t *dbh) {
+static bool pdo_is_in_transaction(pdo_dbh_t *dbh) {
 	if (dbh->methods->in_transaction) {
 		return dbh->methods->in_transaction(dbh);
 	}
@@ -606,7 +606,7 @@ PHP_METHOD(PDO, beginTransaction)
 	}
 
 	if (dbh->methods->begin(dbh)) {
-		dbh->in_txn = 1;
+		dbh->in_txn = true;
 		RETURN_TRUE;
 	}
 
@@ -630,7 +630,7 @@ PHP_METHOD(PDO, commit)
 	}
 
 	if (dbh->methods->commit(dbh)) {
-		dbh->in_txn = 0;
+		dbh->in_txn = false;
 		RETURN_TRUE;
 	}
 
@@ -654,7 +654,7 @@ PHP_METHOD(PDO, rollBack)
 	}
 
 	if (dbh->methods->rollback(dbh)) {
-		dbh->in_txn = 0;
+		dbh->in_txn = false;
 		RETURN_TRUE;
 	}
 
@@ -1462,7 +1462,7 @@ static void pdo_dbh_free_storage(zend_object *std)
 	pdo_dbh_t *dbh = php_pdo_dbh_fetch_inner(std);
 	if (dbh->in_txn && dbh->methods && dbh->methods->rollback) {
 		dbh->methods->rollback(dbh);
-		dbh->in_txn = 0;
+		dbh->in_txn = false;
 	}
 
 	if (dbh->is_persistent && dbh->methods && dbh->methods->persistent_shutdown) {
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
@@ -237,8 +237,9 @@ typedef zend_long (*pdo_dbh_do_func)(pdo_dbh_t *dbh, const char *sql, size_t sql
 /* quote a string */
 typedef int (*pdo_dbh_quote_func)(pdo_dbh_t *dbh, const char *unquoted, size_t unquotedlen, char **quoted, size_t *quotedlen, enum pdo_param_type paramtype);
 
-/* transaction related */
-typedef int (*pdo_dbh_txn_func)(pdo_dbh_t *dbh);
+/* transaction related (beingTransaction(), commit, rollBack, inTransaction)
+ * Return true if currently inside a transaction, false otherwise. */
+typedef bool (*pdo_dbh_txn_func)(pdo_dbh_t *dbh);
 
 /* setting of attributes */
 typedef int (*pdo_dbh_set_attr_func)(pdo_dbh_t *dbh, zend_long attr, zval *val);
@@ -305,6 +306,7 @@ struct pdo_dbh_methods {
 	pdo_dbh_check_liveness_func	check_liveness;
 	pdo_dbh_get_driver_methods_func get_driver_methods;
 	pdo_dbh_request_shutdown	persistent_shutdown;
+	/* if defined to NULL, PDO will use its internal transaction tracking state */
 	pdo_dbh_txn_func		in_transaction;
 	pdo_dbh_get_gc_func		get_gc;
 };
@@ -446,7 +448,7 @@ struct _pdo_dbh_t {
 	unsigned alloc_own_columns:1;
 
 	/* if true, commit or rollBack is allowed to be called */
-	unsigned in_txn:1;
+	bool in_txn:1;
 
 	/* max length a single character can become after correct quoting */
 	unsigned max_escaped_char_length:3;
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
@@ -195,32 +195,32 @@ static int dblib_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unqu
 	return 1;
 }
 
-static int pdo_dblib_transaction_cmd(const char *cmd, pdo_dbh_t *dbh)
+static bool pdo_dblib_transaction_cmd(const char *cmd, pdo_dbh_t *dbh)
 {
 	pdo_dblib_db_handle *H = (pdo_dblib_db_handle *)dbh->driver_data;
 
 	if (FAIL == dbcmd(H->link, cmd)) {
-		return 0;
+		return false;
 	}
 
 	if (FAIL == dbsqlexec(H->link)) {
-		return 0;
+		return false;
 	}
 
-	return 1;
+	return true;
 }
 
-static int dblib_handle_begin(pdo_dbh_t *dbh)
+static bool dblib_handle_begin(pdo_dbh_t *dbh)
 {
 	return pdo_dblib_transaction_cmd("BEGIN TRANSACTION", dbh);
 }
 
-static int dblib_handle_commit(pdo_dbh_t *dbh)
+static bool dblib_handle_commit(pdo_dbh_t *dbh)
 {
 	return pdo_dblib_transaction_cmd("COMMIT TRANSACTION", dbh);
 }
 
-static int dblib_handle_rollback(pdo_dbh_t *dbh)
+static bool dblib_handle_rollback(pdo_dbh_t *dbh)
 {
 	return pdo_dblib_transaction_cmd("ROLLBACK TRANSACTION", dbh);
 }
@@ -417,7 +417,7 @@ static const struct pdo_dbh_methods dblib_methods = {
 	NULL, /* check liveness */
 	NULL, /* get driver methods */
 	NULL, /* request shutdown */
-	NULL, /* in transaction */
+	NULL, /* in transaction, use PDO's internal tracking mechanism */
 	NULL /* get gc */
 };
 
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -389,7 +389,7 @@ int preprocess(const char* sql, int sql_len, char* sql_out, HashTable* named_par
 				}
 				strncpy(pname, start, l);
 				pname[l] = '\0';
-				
+
 				if (named_params) {
 					zval tmp;
 					ZVAL_LONG(&tmp, pindex);
@@ -691,7 +691,7 @@ static int firebird_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t u
 /* }}} */
 
 /* called by PDO to start a transaction */
-static int firebird_handle_begin(pdo_dbh_t *dbh) /* {{{ */
+static bool firebird_handle_begin(pdo_dbh_t *dbh) /* {{{ */
 {
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
 	char tpb[8] = { isc_tpb_version3 }, *ptpb = tpb+1;
@@ -737,35 +737,35 @@ static int firebird_handle_begin(pdo_dbh_t *dbh) /* {{{ */
 #endif
 	if (isc_start_transaction(H->isc_status, &H->tr, 1, &H->db, (unsigned short)(ptpb-tpb), tpb)) {
 		RECORD_ERROR(dbh);
-		return 0;
+		return false;
 	}
-	return 1;
+	return true;
 }
 /* }}} */
 
 /* called by PDO to commit a transaction */
-static int firebird_handle_commit(pdo_dbh_t *dbh) /* {{{ */
+static bool firebird_handle_commit(pdo_dbh_t *dbh) /* {{{ */
 {
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
 
 	if (isc_commit_transaction(H->isc_status, &H->tr)) {
 		RECORD_ERROR(dbh);
-		return 0;
+		return false;
 	}
-	return 1;
+	return true;
 }
 /* }}} */
 
 /* called by PDO to rollback a transaction */
-static int firebird_handle_rollback(pdo_dbh_t *dbh) /* {{{ */
+static bool firebird_handle_rollback(pdo_dbh_t *dbh) /* {{{ */
 {
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
 
 	if (isc_rollback_transaction(H->isc_status, &H->tr)) {
 		RECORD_ERROR(dbh);
-		return 0;
+		return false;
 	}
-	return 1;
+	return true;
 }
 /* }}} */
 
@@ -789,7 +789,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const char *sql, size_t s
 		if (!firebird_handle_begin(dbh)) {
 			return 0;
 		}
-		dbh->in_txn = 1;
+		dbh->in_txn = true;
 	}
 
 	/* allocate the statement */
@@ -804,7 +804,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const char *sql, size_t s
 	new_sql[0] = '\0';
 	if (!preprocess(sql, sql_len, new_sql, named_params)) {
 		strcpy(dbh->error_code, "07000");
-		efree(new_sql);			
+		efree(new_sql);
 		return 0;
 	}
 
@@ -843,7 +843,7 @@ static int firebird_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v
 							if (!firebird_handle_commit(dbh)) {
 								break;
 							}
-							dbh->in_txn = 0;
+							dbh->in_txn = false;
 						}
 					}
 					dbh->auto_commit = bval;
@@ -1008,7 +1008,7 @@ static const struct pdo_dbh_methods firebird_methods = { /* {{{ */
 	NULL, /* check_liveness */
 	NULL, /* get driver methods */
 	NULL, /* request shutdown */
-	NULL, /* in transaction */
+	NULL, /* in transaction, use PDO's internal tracking mechanism */
 	NULL /* get gc */
 };
 /* }}} */
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
@@ -341,7 +341,7 @@ static int mysql_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unqu
 /* }}} */
 
 /* {{{ mysql_handle_begin */
-static int mysql_handle_begin(pdo_dbh_t *dbh)
+static bool mysql_handle_begin(pdo_dbh_t *dbh)
 {
 	PDO_DBG_ENTER("mysql_handle_quoter");
 	PDO_DBG_INF_FMT("dbh=%p", dbh);
@@ -350,28 +350,28 @@ static int mysql_handle_begin(pdo_dbh_t *dbh)
 /* }}} */
 
 /* {{{ mysql_handle_commit */
-static int mysql_handle_commit(pdo_dbh_t *dbh)
+static bool mysql_handle_commit(pdo_dbh_t *dbh)
 {
 	PDO_DBG_ENTER("mysql_handle_commit");
 	PDO_DBG_INF_FMT("dbh=%p", dbh);
 	if (mysql_commit(((pdo_mysql_db_handle *)dbh->driver_data)->server)) {
 		pdo_mysql_error(dbh);
-		PDO_DBG_RETURN(0);
+		PDO_DBG_RETURN(false);
 	}
-	PDO_DBG_RETURN(1);
+	PDO_DBG_RETURN(true);
 }
 /* }}} */
 
 /* {{{ mysql_handle_rollback */
-static int mysql_handle_rollback(pdo_dbh_t *dbh)
+static bool mysql_handle_rollback(pdo_dbh_t *dbh)
 {
 	PDO_DBG_ENTER("mysql_handle_rollback");
 	PDO_DBG_INF_FMT("dbh=%p", dbh);
 	if (mysql_rollback(((pdo_mysql_db_handle *)dbh->driver_data)->server)) {
 		pdo_mysql_error(dbh);
-		PDO_DBG_RETURN(0);
+		PDO_DBG_RETURN(false);
 	}
-	PDO_DBG_RETURN(1);
+	PDO_DBG_RETURN(true);
 }
 /* }}} */
 
@@ -556,7 +556,7 @@ static void pdo_mysql_request_shutdown(pdo_dbh_t *dbh)
 #endif
 
 /* {{{ pdo_mysql_in_transaction */
-static int pdo_mysql_in_transaction(pdo_dbh_t *dbh)
+static bool pdo_mysql_in_transaction(pdo_dbh_t *dbh)
 {
 	pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
 	PDO_DBG_ENTER("pdo_mysql_in_transaction");
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
@@ -391,38 +391,38 @@ static int oci_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unquot
 }
 /* }}} */
 
-static int oci_handle_begin(pdo_dbh_t *dbh) /* {{{ */
+static bool oci_handle_begin(pdo_dbh_t *dbh) /* {{{ */
 {
 	/* with Oracle, there is nothing special to be done */
-	return 1;
+	return true;
 }
 /* }}} */
 
-static int oci_handle_commit(pdo_dbh_t *dbh) /* {{{ */
+static bool oci_handle_commit(pdo_dbh_t *dbh) /* {{{ */
 {
 	pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 
 	H->last_err = OCITransCommit(H->svc, H->err, 0);
 
 	if (H->last_err) {
 		H->last_err = oci_drv_error("OCITransCommit");
-		return 0;
+		return false;
 	}
-	return 1;
+	return true;
 }
 /* }}} */
 
-static int oci_handle_rollback(pdo_dbh_t *dbh) /* {{{ */
+static bool oci_handle_rollback(pdo_dbh_t *dbh) /* {{{ */
 {
 	pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 
 	H->last_err = OCITransRollback(H->svc, H->err, 0);
 
 	if (H->last_err) {
 		H->last_err = oci_drv_error("OCITransRollback");
-		return 0;
+		return false;
 	}
-	return 1;
+	return true;
 }
 /* }}} */
 
@@ -442,7 +442,7 @@ static int oci_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val) /
 					H->last_err = oci_drv_error("OCITransCommit");
 					return 0;
 				}
-				dbh->in_txn = 0;
+				dbh->in_txn = false;
 			}
 
 			dbh->auto_commit = (unsigned int)lval? 1 : 0;
@@ -705,7 +705,7 @@ static const struct pdo_dbh_methods oci_methods = {
 	pdo_oci_check_liveness,	/* check_liveness */
 	NULL, /* get_driver_methods */
 	NULL, /* request_shutdown */
-	NULL, /* in_transaction */
+	NULL, /* in transaction, use PDO's internal tracking mechanism */
 	NULL /* get_gc */
 };
 
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c

Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ PHP_METHOD(PDO, prepare)`
`578`	`578`	`/* }}} */`
`579`	`579`
`580`	`580`
`581`		`-static zend_bool pdo_is_in_transaction(pdo_dbh_t *dbh) {`
	`581`	`+static bool pdo_is_in_transaction(pdo_dbh_t *dbh) {`
`582`	`582`	`if (dbh->methods->in_transaction) {`
`583`	`583`	`return dbh->methods->in_transaction(dbh);`
`584`	`584`	`}`
`@@ -606,7 +606,7 @@ PHP_METHOD(PDO, beginTransaction)`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`if (dbh->methods->begin(dbh)) {`
`609`		`- dbh->in_txn = 1;`
	`609`	`+ dbh->in_txn = true;`
`610`	`610`	`RETURN_TRUE;`
`611`	`611`	`}`
`612`	`612`
`@@ -630,7 +630,7 @@ PHP_METHOD(PDO, commit)`
`630`	`630`	`}`
`631`	`631`
`632`	`632`	`if (dbh->methods->commit(dbh)) {`
`633`		`- dbh->in_txn = 0;`
	`633`	`+ dbh->in_txn = false;`
`634`	`634`	`RETURN_TRUE;`
`635`	`635`	`}`
`636`	`636`
`@@ -654,7 +654,7 @@ PHP_METHOD(PDO, rollBack)`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`if (dbh->methods->rollback(dbh)) {`
`657`		`- dbh->in_txn = 0;`
	`657`	`+ dbh->in_txn = false;`
`658`	`658`	`RETURN_TRUE;`
`659`	`659`	`}`
`660`	`660`
`@@ -1462,7 +1462,7 @@ static void pdo_dbh_free_storage(zend_object *std)`
`1462`	`1462`	`pdo_dbh_t *dbh = php_pdo_dbh_fetch_inner(std);`
`1463`	`1463`	`if (dbh->in_txn && dbh->methods && dbh->methods->rollback) {`
`1464`	`1464`	`dbh->methods->rollback(dbh);`
`1465`		`- dbh->in_txn = 0;`
	`1465`	`+ dbh->in_txn = false;`
`1466`	`1466`	`}`
`1467`	`1467`
`1468`	`1468`	`if (dbh->is_persistent && dbh->methods && dbh->methods->persistent_shutdown) {`
Original file line number	Diff line number	Diff line change
`@@ -195,32 +195,32 @@ static int dblib_handle_quoter(pdo_dbh_t dbh, const char unquoted, size_t unqu`
`195`	`195`	`return 1;`
`196`	`196`	`}`
`197`	`197`
`198`		`-static int pdo_dblib_transaction_cmd(const char cmd, pdo_dbh_t dbh)`
	`198`	`+static bool pdo_dblib_transaction_cmd(const char cmd, pdo_dbh_t dbh)`
`199`	`199`	`{`
`200`	`200`	`pdo_dblib_db_handle H = (pdo_dblib_db_handle )dbh->driver_data;`
`201`	`201`
`202`	`202`	`if (FAIL == dbcmd(H->link, cmd)) {`
`203`		`- return 0;`
	`203`	`+ return false;`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`if (FAIL == dbsqlexec(H->link)) {`
`207`		`- return 0;`
	`207`	`+ return false;`
`208`	`208`	`}`
`209`	`209`
`210`		`- return 1;`
	`210`	`+ return true;`
`211`	`211`	`}`
`212`	`212`
`213`		`-static int dblib_handle_begin(pdo_dbh_t *dbh)`
	`213`	`+static bool dblib_handle_begin(pdo_dbh_t *dbh)`
`214`	`214`	`{`
`215`	`215`	`return pdo_dblib_transaction_cmd("BEGIN TRANSACTION", dbh);`
`216`	`216`	`}`
`217`	`217`
`218`		`-static int dblib_handle_commit(pdo_dbh_t *dbh)`
	`218`	`+static bool dblib_handle_commit(pdo_dbh_t *dbh)`
`219`	`219`	`{`
`220`	`220`	`return pdo_dblib_transaction_cmd("COMMIT TRANSACTION", dbh);`
`221`	`221`	`}`
`222`	`222`
`223`		`-static int dblib_handle_rollback(pdo_dbh_t *dbh)`
	`223`	`+static bool dblib_handle_rollback(pdo_dbh_t *dbh)`
`224`	`224`	`{`
`225`	`225`	`return pdo_dblib_transaction_cmd("ROLLBACK TRANSACTION", dbh);`
`226`	`226`	`}`
`@@ -417,7 +417,7 @@ static const struct pdo_dbh_methods dblib_methods = {`
`417`	`417`	`NULL, /* check liveness */`
`418`	`418`	`NULL, /* get driver methods */`
`419`	`419`	`NULL, /* request shutdown */`
`420`		`- NULL, /* in transaction */`
	`420`	`+ NULL, /* in transaction, use PDO's internal tracking mechanism */`
`421`	`421`	`NULL /* get gc */`
`422`	`422`	`};`
`423`	`423`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ int preprocess(const char* sql, int sql_len, char* sql_out, HashTable* named_par`
`389`	`389`	`}`
`390`	`390`	`strncpy(pname, start, l);`
`391`	`391`	`pname[l] = '\0';`
`392`		`-`
	`392`	`+`
`393`	`393`	`if (named_params) {`
`394`	`394`	`zval tmp;`
`395`	`395`	`ZVAL_LONG(&tmp, pindex);`
`@@ -691,7 +691,7 @@ static int firebird_handle_quoter(pdo_dbh_t dbh, const char unquoted, size_t u`
`691`	`691`	`/* }}} */`
`692`	`692`
`693`	`693`	`/* called by PDO to start a transaction */`
`694`		`-static int firebird_handle_begin(pdo_dbh_t dbh) / {{{ */`
	`694`	`+static bool firebird_handle_begin(pdo_dbh_t dbh) / {{{ */`
`695`	`695`	`{`
`696`	`696`	`pdo_firebird_db_handle H = (pdo_firebird_db_handle )dbh->driver_data;`
`697`	`697`	`char tpb[8] = { isc_tpb_version3 }, *ptpb = tpb+1;`
`@@ -737,35 +737,35 @@ static int firebird_handle_begin(pdo_dbh_t dbh) / {{{ */`
`737`	`737`	`#endif`
`738`	`738`	`if (isc_start_transaction(H->isc_status, &H->tr, 1, &H->db, (unsigned short)(ptpb-tpb), tpb)) {`
`739`	`739`	`RECORD_ERROR(dbh);`
`740`		`- return 0;`
	`740`	`+ return false;`
`741`	`741`	`}`
`742`		`- return 1;`
	`742`	`+ return true;`
`743`	`743`	`}`
`744`	`744`	`/* }}} */`
`745`	`745`
`746`	`746`	`/* called by PDO to commit a transaction */`
`747`		`-static int firebird_handle_commit(pdo_dbh_t dbh) / {{{ */`
	`747`	`+static bool firebird_handle_commit(pdo_dbh_t dbh) / {{{ */`
`748`	`748`	`{`
`749`	`749`	`pdo_firebird_db_handle H = (pdo_firebird_db_handle )dbh->driver_data;`
`750`	`750`
`751`	`751`	`if (isc_commit_transaction(H->isc_status, &H->tr)) {`
`752`	`752`	`RECORD_ERROR(dbh);`
`753`		`- return 0;`
	`753`	`+ return false;`
`754`	`754`	`}`
`755`		`- return 1;`
	`755`	`+ return true;`
`756`	`756`	`}`
`757`	`757`	`/* }}} */`
`758`	`758`
`759`	`759`	`/* called by PDO to rollback a transaction */`
`760`		`-static int firebird_handle_rollback(pdo_dbh_t dbh) / {{{ */`
	`760`	`+static bool firebird_handle_rollback(pdo_dbh_t dbh) / {{{ */`
`761`	`761`	`{`
`762`	`762`	`pdo_firebird_db_handle H = (pdo_firebird_db_handle )dbh->driver_data;`
`763`	`763`
`764`	`764`	`if (isc_rollback_transaction(H->isc_status, &H->tr)) {`
`765`	`765`	`RECORD_ERROR(dbh);`
`766`		`- return 0;`
	`766`	`+ return false;`
`767`	`767`	`}`
`768`		`- return 1;`
	`768`	`+ return true;`
`769`	`769`	`}`
`770`	`770`	`/* }}} */`
`771`	`771`
`@@ -789,7 +789,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t dbh, const char sql, size_t s`
`789`	`789`	`if (!firebird_handle_begin(dbh)) {`
`790`	`790`	`return 0;`
`791`	`791`	`}`
`792`		`- dbh->in_txn = 1;`
	`792`	`+ dbh->in_txn = true;`
`793`	`793`	`}`
`794`	`794`
`795`	`795`	`/* allocate the statement */`
`@@ -804,7 +804,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t dbh, const char sql, size_t s`
`804`	`804`	`new_sql[0] = '\0';`
`805`	`805`	`if (!preprocess(sql, sql_len, new_sql, named_params)) {`
`806`	`806`	`strcpy(dbh->error_code, "07000");`
`807`		`- efree(new_sql);`
	`807`	`+ efree(new_sql);`
`808`	`808`	`return 0;`
`809`	`809`	`}`
`810`	`810`
`@@ -843,7 +843,7 @@ static int firebird_handle_set_attribute(pdo_dbh_t dbh, zend_long attr, zval v`
`843`	`843`	`if (!firebird_handle_commit(dbh)) {`
`844`	`844`	`break;`
`845`	`845`	`}`
`846`		`- dbh->in_txn = 0;`
	`846`	`+ dbh->in_txn = false;`
`847`	`847`	`}`
`848`	`848`	`}`
`849`	`849`	`dbh->auto_commit = bval;`
`@@ -1008,7 +1008,7 @@ static const struct pdo_dbh_methods firebird_methods = { /* {{{ */`
`1008`	`1008`	`NULL, /* check_liveness */`
`1009`	`1009`	`NULL, /* get driver methods */`
`1010`	`1010`	`NULL, /* request shutdown */`
`1011`		`- NULL, /* in transaction */`
	`1011`	`+ NULL, /* in transaction, use PDO's internal tracking mechanism */`
`1012`	`1012`	`NULL /* get gc */`
`1013`	`1013`	`};`
`1014`	`1014`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -391,38 +391,38 @@ static int oci_handle_quoter(pdo_dbh_t dbh, const char unquoted, size_t unquot`
`391`	`391`	`}`
`392`	`392`	`/* }}} */`
`393`	`393`
`394`		`-static int oci_handle_begin(pdo_dbh_t dbh) / {{{ */`
	`394`	`+static bool oci_handle_begin(pdo_dbh_t dbh) / {{{ */`
`395`	`395`	`{`
`396`	`396`	`/* with Oracle, there is nothing special to be done */`
`397`		`- return 1;`
	`397`	`+ return true;`
`398`	`398`	`}`
`399`	`399`	`/* }}} */`
`400`	`400`
`401`		`-static int oci_handle_commit(pdo_dbh_t dbh) / {{{ */`
	`401`	`+static bool oci_handle_commit(pdo_dbh_t dbh) / {{{ */`
`402`	`402`	`{`
`403`	`403`	`pdo_oci_db_handle H = (pdo_oci_db_handle )dbh->driver_data;`
`404`	`404`
`405`	`405`	`H->last_err = OCITransCommit(H->svc, H->err, 0);`
`406`	`406`
`407`	`407`	`if (H->last_err) {`
`408`	`408`	`H->last_err = oci_drv_error("OCITransCommit");`
`409`		`- return 0;`
	`409`	`+ return false;`
`410`	`410`	`}`
`411`		`- return 1;`
	`411`	`+ return true;`
`412`	`412`	`}`
`413`	`413`	`/* }}} */`
`414`	`414`
`415`		`-static int oci_handle_rollback(pdo_dbh_t dbh) / {{{ */`
	`415`	`+static bool oci_handle_rollback(pdo_dbh_t dbh) / {{{ */`
`416`	`416`	`{`
`417`	`417`	`pdo_oci_db_handle H = (pdo_oci_db_handle )dbh->driver_data;`
`418`	`418`
`419`	`419`	`H->last_err = OCITransRollback(H->svc, H->err, 0);`
`420`	`420`
`421`	`421`	`if (H->last_err) {`
`422`	`422`	`H->last_err = oci_drv_error("OCITransRollback");`
`423`		`- return 0;`
	`423`	`+ return false;`
`424`	`424`	`}`
`425`		`- return 1;`
	`425`	`+ return true;`
`426`	`426`	`}`
`427`	`427`	`/* }}} */`
`428`	`428`
`@@ -442,7 +442,7 @@ static int oci_handle_set_attribute(pdo_dbh_t dbh, zend_long attr, zval val) /`
`442`	`442`	`H->last_err = oci_drv_error("OCITransCommit");`
`443`	`443`	`return 0;`
`444`	`444`	`}`
`445`		`- dbh->in_txn = 0;`
	`445`	`+ dbh->in_txn = false;`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`dbh->auto_commit = (unsigned int)lval? 1 : 0;`
`@@ -705,7 +705,7 @@ static const struct pdo_dbh_methods oci_methods = {`
`705`	`705`	`pdo_oci_check_liveness, /* check_liveness */`
`706`	`706`	`NULL, /* get_driver_methods */`
`707`	`707`	`NULL, /* request_shutdown */`
`708`		`- NULL, /* in_transaction */`
	`708`	`+ NULL, /* in transaction, use PDO's internal tracking mechanism */`
`709`	`709`	`NULL /* get_gc */`
`710`	`710`	`};`
`711`	`711`