Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements for database handle and connection attributes #190

Merged
merged 8 commits into from
Aug 13, 2023
Merged

Improvements for database handle and connection attributes #190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e00d17d
Simplify setting mariadb_client_found_rows attribute
pali Jan 17, 2019
807289f
Simplify setting mariadb_multi_statements attribute
pali Jan 17, 2019
92a65bd
Allow to query and change mariadb_multi_statements attribute on activ…
pali Jan 17, 2019
dda5ab9
Add connect option mariadb_auth_plugin for specifying auth plugin
pali Mar 2, 2020
a705c4c
Allow to specify auth plugin for running tests
pali Mar 2, 2020
112e814
Update documentation for some connection / dbh attributes
pali Jul 14, 2023
2fee517
Add test for changing $dbh->{mariadb_multi_statements} at runtime
pali Jul 14, 2023
07afe9a
Checkout correct git commit for pull requests on Github Actions CI
pali Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions dbdimp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1996,6 +1996,7 @@ static bool mariadb_dr_connect(
(void)hv_stores(processed, "mariadb_multi_statements", &PL_sv_yes);
if ((svp = hv_fetchs(hv, "mariadb_multi_statements", FALSE)) && *svp && SvTRUE(*svp))
{
imp_dbh->use_multi_statements = TRUE;
client_flag |= CLIENT_MULTI_STATEMENTS;
}

Expand Down Expand Up @@ -3463,6 +3464,17 @@ mariadb_db_STORE_attrib(
return 0;
#endif
}
else if (memEQs(key, kl, "mariadb_multi_statements"))
{
if (!imp_dbh->connected) /* When not connected, it is handled in mariadb_dr_connect() */
return 0;
if (mysql_set_server_option(imp_dbh->pmysql, bool_value ? MYSQL_OPTION_MULTI_STATEMENTS_ON : MYSQL_OPTION_MULTI_STATEMENTS_OFF) != 0)
{
mariadb_dr_do_error(dbh, mysql_errno(imp_dbh->pmysql), mysql_error(imp_dbh->pmysql), mysql_sqlstate(imp_dbh->pmysql));
return 0;
}
imp_dbh->use_multi_statements = bool_value;
}
else
{
if (imp_dbh->connected) /* Ignore unknown attributes passed by DBI->connect, they are handled in mariadb_dr_connect() */
Expand Down Expand Up @@ -3724,6 +3736,8 @@ SV* mariadb_db_FETCH_attrib(SV *dbh, imp_dbh_t *imp_dbh, SV *keysv)
result = imp_dbh->pmysql ? sv_2mortal(newSVuv(mysql_warning_count(imp_dbh->pmysql))) : &PL_sv_undef;
else if (memEQs(key, kl, "mariadb_use_result"))
result = boolSV(imp_dbh->use_mysql_use_result);
else if (memEQs(key, kl, "mariadb_multi_statements"))
result = boolSV(imp_dbh->use_multi_statements);
else
{
error_unknown_attribute(dbh, key);
Expand Down
1 change: 1 addition & 0 deletions dbdimp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ struct imp_dbh_st {
*/
bool use_server_side_prepare;
bool disable_fallback_for_server_prepare;
bool use_multi_statements;
void* async_query_in_flight;
my_ulonglong insertid;
struct {
Expand Down