php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-15 20:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Handle mysqli errors in more cases
  Sync test with master
This commit is contained in:
Nikita Popov
2020-10-28 11:37:54 +01:00
parent dc03e621b8 d928c58281
commit 67598afbdb
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/mysqli/mysqli_api.c
View File

@@ -169,6 +169,7 @@ PHP_FUNCTION(mysqli_autocommit)
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
if (mysql_autocommit(mysql->mysql, (my_bool)automode)) {
MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
RETURN_FALSE;
}
RETURN_TRUE;
@@ -708,6 +709,7 @@ PHP_FUNCTION(mysqli_commit)
#else
if (FAIL == mysqlnd_commit(mysql->mysql, flags, name)) {
#endif
MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
RETURN_FALSE;
}
RETURN_TRUE;
@@ -1921,6 +1923,7 @@ PHP_FUNCTION(mysqli_rollback)
#else
if (FAIL == mysqlnd_rollback(mysql->mysql, flags, name)) {
#endif
MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
RETURN_FALSE;
}
RETURN_TRUE;
@@ -2291,6 +2294,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
#else
if (FAIL == mysql_stmt_attr_set(stmt->stmt, attr, mode_p)) {
#endif
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
RETURN_FALSE;
}
RETURN_TRUE;

41
ext/mysqli/tests/mysqli_report.phpt
View File

@@ -49,6 +49,20 @@ require_once('skipifconnectfailure.inc');
printf("[009] select_db should have failed\n");
// mysqli_store_result() and mysqli_use_result() cannot be tested, because one would need to cause an error inside the C function to test it
mysqli_multi_query($link, "SELECT 1; FOO;");
mysqli_autocommit($link, true);
mysqli_commit($link);
mysqli_rollback($link);
$stmt = mysqli_stmt_init($link);
mysqli_stmt_prepare($stmt, "SELECT id FROM test WHERE id > ?");
while(mysqli_more_results($link)) {
mysqli_next_result($link);
$res = mysqli_store_result($link);
}
mysqli_next_result($link);
$stmt = mysqli_prepare($link, "SELECT 1");
mysqli_stmt_attr_set($stmt, MYSQLI_STMT_ATTR_CURSOR_TYPE, MYSQLI_CURSOR_TYPE_FOR_UPDATE);
// Check that none of the above would have caused any error messages if MYSQL_REPORT_ERROR would
// not have been set. If that would be the case, the test would be broken.
@@ -65,6 +79,21 @@ require_once('skipifconnectfailure.inc');
mysqli_real_query($link, "FOO");
mysqli_select_db($link, "Oh lord, let this be an unknown database name");
mysqli_multi_query($link, "SELECT 1; FOO;");
mysqli_autocommit($link, true);
mysqli_commit($link);
mysqli_rollback($link);
$stmt = mysqli_stmt_init($link);
mysqli_stmt_prepare($stmt, "SELECT id FROM test WHERE id > ?");
while(mysqli_more_results($link)) {
mysqli_next_result($link);
$res = mysqli_store_result($link);
}
mysqli_next_result($link);
$stmt = mysqli_prepare($link, "SELECT 1");
mysqli_stmt_attr_set($stmt, MYSQLI_STMT_ATTR_CURSOR_TYPE, MYSQLI_CURSOR_TYPE_FOR_UPDATE);
/*
Internal macro MYSQL_REPORT_STMT_ERROR
*/
@@ -292,6 +321,18 @@ mysqli_kill(): Argument #2 ($process_id) must be greater than 0
Warning: mysqli_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
Warning: mysqli_real_query(): (%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
Warning: mysqli_autocommit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
Warning: mysqli_commit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
Warning: mysqli_rollback(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
Warning: mysqli_stmt_prepare(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d
Warning: mysqli_store_result(): (%s/%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
Warning: mysqli_stmt_attr_set(): (%s/%d): Not implemented in %s on line %d
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
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

1
ext/mysqlnd/mysqlnd_ps.c
View File

@@ -409,6 +409,7 @@ MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const
ret = conn->command->stmt_prepare(conn, query_string);
if (FAIL == ret) {
COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info);
goto fail;
}
}