Skip to content

Commit 832c30f

Browse files
SakiTakamachiSakiTakamachi
committed
Added transaction check process
fix macro fix report flags fix tests fix tests
1 parent 1b846f8 commit 832c30f

8 files changed

+68
-7
lines changed

‎ext/mysqli/mysqli_api.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,11 @@ PHP_FUNCTION(mysqli_commit)
313313
}
314314
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
315315

316+
if (!MYSQLI_IS_IN_TRANSACTION(mysql)) {
317+
php_mysqli_report_error(NULL, 0, "There is no active transaction");
318+
RETURN_FALSE;
319+
}
320+
316321
if (FAIL == mysqlnd_commit(mysql->mysql, flags, name)) {
317322
MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
318323
RETURN_FALSE;
@@ -523,12 +528,12 @@ PHP_FUNCTION(mysqli_execute_query)
523528

524529
if (FAIL == mysql_stmt_prepare(stmt->stmt, query, query_len)) {
525530
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
526-
531+
527532
close_stmt_and_copy_errors(stmt, mysql);
528533
RETURN_FALSE;
529534
}
530535

531-
/* The bit below, which is copied from mysqli_prepare, is needed for bad index exceptions */
536+
/* The bit below, which is copied from mysqli_prepare, is needed for bad index exceptions */
532537
/* don't initialize stmt->query with NULL, we ecalloc()-ed the memory */
533538
/* Get performance boost if reporting is switched off */
534539
if (query_len && (MyG(report_mode) & MYSQLI_REPORT_INDEX)) {
@@ -1420,6 +1425,10 @@ PHP_FUNCTION(mysqli_rollback)
14201425
}
14211426
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
14221427

1428+
if (!MYSQLI_IS_IN_TRANSACTION(mysql)) {
1429+
php_mysqli_report_error(NULL, 0, "There is no active transaction");
1430+
RETURN_FALSE;
1431+
}
14231432

14241433
if (FAIL == mysqlnd_rollback(mysql->mysql, flags, name)) {
14251434
MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);

‎ext/mysqli/mysqli_nonapi.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,6 +1021,11 @@ PHP_FUNCTION(mysqli_begin_transaction)
10211021
RETURN_THROWS();
10221022
}
10231023

1024+
if (MYSQLI_IS_IN_TRANSACTION(mysql)) {
1025+
php_mysqli_report_error(NULL, 0, "There is already an active transaction");
1026+
RETURN_FALSE;
1027+
}
1028+
10241029
if (FAIL == mysqlnd_begin_transaction(mysql->mysql, flags, name)) {
10251030
RETURN_FALSE;
10261031
}

‎ext/mysqli/php_mysqli_structs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
234234
intern->ptr = NULL; \
235235
}
236236

237+
#define MYSQLI_IS_IN_TRANSACTION(__mysql) \
238+
((mysqli_server_status(__mysql->mysql) & SERVER_STATUS_IN_TRANS) != 0)
237239

238240
ZEND_BEGIN_MODULE_GLOBALS(mysqli)
239241
zend_long num_links;

‎ext/mysqli/tests/mysqli_begin_transaction.phpt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,30 @@ if (!have_innodb($link))
8585

8686
if (mysqli_get_server_version($link) >= 50605) {
8787
/* does it like stupid names? */
88-
if (@!$link->begin_transaction(MYSQLI_TRANS_START_READ_WRITE, "*/trick me?\n\0"))
89-
printf("[020] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
88+
if (@!$link->begin_transaction(MYSQLI_TRANS_START_READ_WRITE, "*/trick me?\n\0")) {
89+
printf("[020] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
90+
} else {
91+
mysqli_rollback($link);
92+
}
9093

9194
/* does it like stupid names? */
92-
if (@!$link->begin_transaction(MYSQLI_TRANS_START_READ_WRITE, "az09"))
95+
if (@!$link->begin_transaction(MYSQLI_TRANS_START_READ_WRITE, "az09")) {
9396
printf("[021] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
97+
} else {
98+
mysqli_rollback($link);
99+
}
94100
}
95101

102+
mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT);
103+
try {
104+
mysqli_begin_transaction($link);
105+
mysqli_begin_transaction($link);
106+
} catch (\mysqli_sql_exception $e) {
107+
echo $e->getMessage() . \PHP_EOL;
108+
}
109+
110+
mysqli_rollback($link);
111+
96112
print "done!";
97113
?>
98114
--CLEAN--
@@ -102,4 +118,5 @@ if (!have_innodb($link))
102118
--EXPECT--
103119
NULL
104120
mysqli_begin_transaction(): Argument #2 ($flags) must be one of the MYSQLI_TRANS_* constants
121+
There is already an active transaction
105122
done!

‎ext/mysqli/tests/mysqli_commit.phpt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ if (!have_innodb($link))
5656
echo $exception->getMessage() . "\n";
5757
}
5858

59+
$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
60+
mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT);
61+
try {
62+
mysqli_commit($link);
63+
} catch (\mysqli_sql_exception $e) {
64+
echo $e->getMessage() . \PHP_EOL;
65+
}
66+
5967
print "done!";
6068
?>
6169
--CLEAN--
@@ -64,4 +72,5 @@ require_once 'clean_table.inc';
6472
?>
6573
--EXPECT--
6674
mysqli object is already closed
75+
There is no active transaction
6776
done!

‎ext/mysqli/tests/mysqli_commit_oo.phpt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if (!have_innodb($link))
2424

2525
$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
2626

27+
$mysqli->begin_transaction();
2728
if (true !== ($tmp = $mysqli->commit())) {
2829
printf("[002] Expecting boolean/true got %s/%s\n", gettype($tmp), $tmp);
2930
}
@@ -66,16 +67,21 @@ if (!have_innodb($link))
6667
printf("[011] [%d] %s\n", $mysqli->errno, $mysqli->error);
6768
}
6869

70+
$mysqli->begin_transaction();
6971
if (!$mysqli->commit(0 , "tx_name0123")) {
7072
printf("[012] [%d] %s\n", $mysqli->errno, $mysqli->error);
7173
}
7274

75+
$mysqli->begin_transaction();
7376
var_dump($mysqli->commit(0 , "*/ nonsense"));
7477

78+
$mysqli->begin_transaction();
7579
var_dump($mysqli->commit(0 , "tx_name ulf вендел"));
7680

81+
$mysqli->begin_transaction();
7782
var_dump($mysqli->commit(0 , "tx_name \t\n\r\b"));
7883

84+
$mysqli->begin_transaction();
7985
if (!$mysqli->commit(MYSQLI_TRANS_COR_AND_CHAIN | MYSQLI_TRANS_COR_NO_RELEASE , "tx_name")) {
8086
printf("[016] [%d] %s\n", $mysqli->errno, $mysqli->error);
8187
}

‎ext/mysqli/tests/mysqli_report.phpt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ Warning: mysqli_real_query(): (%d/%d): You have an error in your SQL syntax; che
323323

324324
Warning: mysqli_autocommit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
325325

326-
Warning: mysqli_commit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
326+
Warning: mysqli_commit(): (%s/%d): There is no active transaction in %s on line %d
327327

328-
Warning: mysqli_rollback(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
328+
Warning: mysqli_rollback(): (%s/%d): There is no active transaction in %s on line %d
329329

330330
Warning: mysqli_stmt_prepare(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
331331

@@ -336,6 +336,10 @@ Warning: mysqli_store_result(): (%s/%d): You have an error in your SQL syntax; c
336336
Warning: mysqli_stmt_attr_set(): (%s/%d): Not implemented in %s on line %d
337337
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
338338

339+
Warning: mysqli_commit(): (%s/%d): There is no active transaction in %s on line %d
340+
341+
Warning: mysqli_rollback(): (%s/%d): There is no active transaction in %s on line %d
342+
339343
Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
340344
[013] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r
341345
[016] Access denied for user '%s'@'%s'%r( \(using password: \w+\)){0,1}%r

‎ext/mysqli/tests/mysqli_rollback.phpt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ if (!have_innodb($link))
5353
echo $exception->getMessage() . "\n";
5454
}
5555

56+
$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
57+
mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT);
58+
try {
59+
mysqli_rollback($link);
60+
} catch (\mysqli_sql_exception $e) {
61+
echo $e->getMessage() . \PHP_EOL;
62+
}
63+
5664
print "done!\n";
5765
?>
5866
--CLEAN--
@@ -61,4 +69,5 @@ require_once 'clean_table.inc';
6169
?>
6270
--EXPECT--
6371
mysqli object is already closed
72+
There is no active transaction
6473
done!

0 commit comments

Comments
 (0)