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

Fix support for magic scalars #76

Merged
merged 3 commits into from
Jan 14, 2017
Merged

Fix support for magic scalars #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce334a8
Fix support for magic scalars
pali Dec 19, 2016
616d849
Add test for tied magic scalars
pali Dec 21, 2016
90d7bc7
Skip some tests for magic scalars which do not pass prior to perl 5.15.4
pali Jan 10, 2017
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
1 change: 1 addition & 0 deletions MANIFEST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ t/90utf8_params.t
t/91errcheck.t
t/99_bug_server_prepare_blob_null.t
t/lib.pl
t/magic.t
t/manifest.t
t/mysql.dbtest
t/pod.t
Expand Down
61 changes: 31 additions & 30 deletions dbdimp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void get_param(pTHX_ SV *param, int field, bool enable_utf8, bool is_binary, cha
STRLEN len;
int is_utf8;

buf = SvPV(param, len);
buf = SvPV_nomg(param, len);
is_utf8 = SvUTF8(param);
if (enable_utf8 && !is_binary && !is_utf8 && str_is_nonascii(buf, len))
{
Expand Down Expand Up @@ -107,7 +107,7 @@ void get_statement(pTHX_ SV *statement, bool enable_utf8, char **out_buf, STRLEN
STRLEN len;
int is_utf8;

buf = SvPV(statement, len);
buf = SvPV_nomg(statement, len);
is_utf8 = SvUTF8(statement);
if (enable_utf8 && !is_utf8 && str_is_nonascii(buf, len))
{
Expand Down Expand Up @@ -1760,7 +1760,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_embedded_groups", 21, FALSE)) &&
*svp && SvTRUE(*svp))
{
options = SvPV(*svp, lna);
options = SvPV_nomg(*svp, lna);
imp_drh->embedded.groups=newSVsv(*svp);

if ((server_groups_cnt=count_embedded_options(options)))
Expand All @@ -1780,7 +1780,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_embedded_options", 22, FALSE)) &&
*svp && SvTRUE(*svp))
{
options = SvPV(*svp, lna);
options = SvPV_nomg(*svp, lna);
imp_drh->embedded.args=newSVsv(*svp);

if ((server_args_cnt=count_embedded_options(options)))
Expand Down Expand Up @@ -1816,11 +1816,11 @@ MYSQL *mysql_dr_connect(

if ( ((svp = hv_fetch(hv, "mysql_embedded_groups", 21, FALSE)) &&
*svp && SvTRUE(*svp)))
rc =+ abs(sv_cmp(*svp, imp_drh->embedded.groups));
rc =+ abs(sv_cmp_flags(*svp, imp_drh->embedded.groups, 0));

if ( ((svp = hv_fetch(hv, "mysql_embedded_options", 22, FALSE)) &&
*svp && SvTRUE(*svp)) )
rc =+ abs(sv_cmp(*svp, imp_drh->embedded.args));
rc =+ abs(sv_cmp_flags(*svp, imp_drh->embedded.args, 0));

if (rc)
{
Expand Down Expand Up @@ -1856,7 +1856,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_init_command", 18, FALSE)) &&
*svp && SvTRUE(*svp))
{
char* df = SvPV(*svp, lna);
char* df = SvPV_nomg(*svp, lna);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh),
"imp_dbh->mysql_dr_connect: Setting" \
Expand All @@ -1875,7 +1875,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_connect_timeout", 21, FALSE))
&& *svp && SvTRUE(*svp))
{
int to = SvIV(*svp);
int to = SvIV_nomg(*svp);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh),
"imp_dbh->mysql_dr_connect: Setting" \
Expand All @@ -1886,7 +1886,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_write_timeout", 19, FALSE))
&& *svp && SvTRUE(*svp))
{
int to = SvIV(*svp);
int to = SvIV_nomg(*svp);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh),
"imp_dbh->mysql_dr_connect: Setting" \
Expand All @@ -1897,7 +1897,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_read_timeout", 18, FALSE))
&& *svp && SvTRUE(*svp))
{
int to = SvIV(*svp);
int to = SvIV_nomg(*svp);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh),
"imp_dbh->mysql_dr_connect: Setting" \
Expand All @@ -1918,7 +1918,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_read_default_file", 23, FALSE)) &&
*svp && SvTRUE(*svp))
{
char* df = SvPV(*svp, lna);
char* df = SvPV_nomg(*svp, lna);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh),
"imp_dbh->mysql_dr_connect: Reading" \
Expand All @@ -1928,7 +1928,7 @@ MYSQL *mysql_dr_connect(
if ((svp = hv_fetch(hv, "mysql_read_default_group", 24,
FALSE)) &&
*svp && SvTRUE(*svp)) {
char* gr = SvPV(*svp, lna);
char* gr = SvPV_nomg(*svp, lna);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh),
"imp_dbh->mysql_dr_connect: Using" \
Expand Down Expand Up @@ -2566,10 +2566,10 @@ dbd_db_STORE_attrib(
{
dTHX;
STRLEN kl;
char *key = SvPV(keysv, kl);
char *key = SvPV(keysv, kl); /* needs to process get magic */
SV *cachesv = Nullsv;
int cacheit = FALSE;
const bool bool_value = SvTRUE(valuesv);
const bool bool_value = SvTRUE_nomg(valuesv);

if (kl==10 && strEQ(key, "AutoCommit"))
{
Expand Down Expand Up @@ -2637,12 +2637,12 @@ dbd_db_STORE_attrib(
imp_dbh->enable_utf8mb4 = bool_value;
#if FABRIC_SUPPORT
else if (kl == 22 && strEQ(key, "mysql_fabric_opt_group"))
mysql_options(imp_dbh->pmysql, FABRIC_OPT_GROUP, (void *)SvPVbyte_nolen(valuesv));
mysql_options(imp_dbh->pmysql, FABRIC_OPT_GROUP, (void *)SvPV_nomg_nolen(valuesv));
else if (kl == 29 && strEQ(key, "mysql_fabric_opt_default_mode"))
{
if (SvOK(valuesv)) {
STRLEN len;
const char *str = SvPVbyte(valuesv, len);
const char *str = SvPV_nomg(valuesv, len);
if ( len == 0 || ( len == 2 && (strnEQ(str, "ro", 3) || strnEQ(str, "rw", 3)) ) )
mysql_options(imp_dbh->pmysql, FABRIC_OPT_DEFAULT_MODE, len == 0 ? NULL : str);
else
Expand All @@ -2655,7 +2655,7 @@ dbd_db_STORE_attrib(
else if (kl == 21 && strEQ(key, "mysql_fabric_opt_mode"))
{
STRLEN len;
const char *str = SvPVbyte(valuesv, len);
const char *str = SvPV_nomg(valuesv, len);
if (len != 2 || (strnNE(str, "ro", 3) && strnNE(str, "rw", 3)))
croak("Valid settings for FABRIC_OPT_MODE are 'ro' or 'rw'");

Expand Down Expand Up @@ -2763,7 +2763,7 @@ SV* dbd_db_FETCH_attrib(SV *dbh, imp_dbh_t *imp_dbh, SV *keysv)
{
dTHX;
STRLEN kl;
char *key = SvPV(keysv, kl);
char *key = SvPV(keysv, kl); /* needs to process get magic */
SV* result = NULL;
dbh= dbh;

Expand Down Expand Up @@ -4819,7 +4819,7 @@ dbd_st_STORE_attrib(
{
dTHX;
STRLEN(kl);
char *key= SvPV(keysv, kl);
char *key= SvPV(keysv, kl); /* needs to process get magic */
int retval= FALSE;
D_imp_xxh(sth);

Expand All @@ -4830,7 +4830,7 @@ dbd_st_STORE_attrib(

if (strEQ(key, "mysql_use_result"))
{
imp_sth->use_mysql_use_result= SvTRUE(valuesv);
imp_sth->use_mysql_use_result= SvTRUE_nomg(valuesv);
}

if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
Expand Down Expand Up @@ -5025,7 +5025,7 @@ dbd_st_FETCH_internal(
{
dTHX;
STRLEN(kl);
char *key= SvPV(keysv, kl);
char *key= SvPV(keysv, kl); /* needs to process get magic */
SV *retsv= Nullsv;
D_imp_xxh(sth);

Expand Down Expand Up @@ -5218,7 +5218,7 @@ int dbd_st_blob_read (
int dbd_bind_ph(SV *sth, imp_sth_t *imp_sth, SV *param, SV *value,
IV sql_type, SV *attribs, int is_inout, IV maxlen) {
dTHX;
int param_num= SvIV(param);
int param_num= SvIV(param); /* needs to process get magic */
int idx= param_num - 1;
char *err_msg;
bool enable_utf8;
Expand Down Expand Up @@ -5258,6 +5258,7 @@ int dbd_bind_ph(SV *sth, imp_sth_t *imp_sth, SV *param, SV *value,
*/
if (SvOK(value) && sql_type_is_numeric(sql_type))
{
/* FIXME: looks_like_number() process get magic prior to perl 5.15.4 */
if (! looks_like_number(value))
{
err_msg = SvPVX(sv_2mortal(newSVpvf(
Expand Down Expand Up @@ -5290,7 +5291,7 @@ int dbd_bind_ph(SV *sth, imp_sth_t *imp_sth, SV *param, SV *value,
#endif
if (!SvIOK(value) && DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh), "\t\tTRY TO BIND AN INT NUMBER\n");
int_val= SvIV(value);
int_val= SvIV_nomg(value);
if (SvIsUV(value))
buffer_is_unsigned= 1;

Expand Down Expand Up @@ -5374,7 +5375,7 @@ int dbd_bind_ph(SV *sth, imp_sth_t *imp_sth, SV *param, SV *value,
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh), "\t\tTRY TO BIND AN LONGLONG INT NUMBER FROM STRING\n");

buf= SvPV_nolen(value);
buf= SvPV_nomg_nolen(value);
val= strtoll(buf, NULL, 10);
if (val == LLONG_MAX)
{
Expand Down Expand Up @@ -5404,7 +5405,7 @@ int dbd_bind_ph(SV *sth, imp_sth_t *imp_sth, SV *param, SV *value,
if (!SvNOK(value) && DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh), "\t\tTRY TO BIND A FLOAT NUMBER\n");
buffer_length = sizeof(imp_sth->fbind[idx].numeric_val.fval);
imp_sth->fbind[idx].numeric_val.fval= SvNV(value);
imp_sth->fbind[idx].numeric_val.fval= SvNV_nomg(value);
buffer=(char*)&(imp_sth->fbind[idx].numeric_val.fval);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_xxh),
Expand All @@ -5417,9 +5418,9 @@ int dbd_bind_ph(SV *sth, imp_sth_t *imp_sth, SV *param, SV *value,
PerlIO_printf(DBIc_LOGPIO(imp_xxh), "\t\tTRY TO BIND A DOUBLE NUMBER\n");
buffer_length = sizeof(imp_sth->fbind[idx].numeric_val.dval);
#if NVSIZE >= 8
imp_sth->fbind[idx].numeric_val.dval= SvNV(value);
imp_sth->fbind[idx].numeric_val.dval= SvNV_nomg(value);
#else
imp_sth->fbind[idx].numeric_val.dval= atof(SvPV_nolen(value));
imp_sth->fbind[idx].numeric_val.dval= atof(SvPV_nomg_nolen(value));
#endif
buffer=(char*)&(imp_sth->fbind[idx].numeric_val.dval);
if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
Expand Down Expand Up @@ -5697,13 +5698,13 @@ SV* dbd_db_quote(SV *dbh, SV *str, SV *type)

D_imp_dbh(dbh);

if (type && SvMAGICAL(type))
if (type && SvGMAGICAL(type))
mg_get(type);

if (type && SvOK(type))
{
int i;
int tp= SvIV(type);
int tp= SvIV_nomg(type);
for (i= 0; i < (int)SQL_GET_TYPE_INFO_num; i++)
{
const sql_type_info_t *t= &SQL_GET_TYPE_INFO_values[i];
Expand All @@ -5716,7 +5717,7 @@ SV* dbd_db_quote(SV *dbh, SV *str, SV *type)
}
}

ptr= SvPV(str, len);
ptr= SvPV_nomg(str, len);
result= newSV(len*2+3);
if (SvUTF8(str)) SvUTF8_on(result);
sptr= SvPVX(result);
Expand Down
20 changes: 20 additions & 0 deletions dbdimp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,26 @@
#include <errmsg.h> /* Comes with MySQL-devel */
#include <stdint.h> /* For uint32_t */

#ifndef SvPV_nomg_nolen
#define SvPV_nomg_nolen(sv) ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK ? SvPVX(sv) : sv_2pv_flags(sv, &PL_na, 0))
#endif

#ifndef SvTRUE_nomg
#define SvTRUE_nomg SvTRUE /* SvTRUE does not process get magic for scalars with already cached values, so we are safe */
#endif

#ifndef SvIV_nomg
#define SvIV_nomg SvIV /* Sorry, there is no way to handle integer magic scalars properly prior to perl 5.9.1 */
#endif

#ifndef SvNV_nomg
#define SvNV_nomg SvNV /* Sorry, there is no way to handle numeric magic scalars properly prior to perl 5.13.2 */
#endif

#ifndef sv_cmp_flags
#define sv_cmp_flags(a,b,c) sv_cmp(a,b) /* Sorry, there is no way to compare magic scalars properly prior to perl 5.9.1 */
#endif

/* For now, we hardcode this, but in the future,
* we can detect capabilities of the MySQL libraries
* we're talking to */
Expand Down
33 changes: 17 additions & 16 deletions mysql.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,12 @@ do(dbh, statement, attr=Nullsv, ...)
CODE:
{
D_imp_dbh(dbh);
int num_params= 0;
int num_params= (items > 3 ? items - 3 : 0);
int i;
int retval;
struct imp_sth_ph_st* params= NULL;
MYSQL_RES* result= NULL;
SV* async = NULL;
bool async= FALSE;
bool enable_utf8 = (imp_dbh->enable_utf8 || imp_dbh->enable_utf8mb4);
#if MYSQL_VERSION_ID >= MULTIPLE_RESULT_SET_VERSION
int next_result_rc;
Expand All @@ -282,6 +283,14 @@ do(dbh, statement, attr=Nullsv, ...)
mysql_free_result(res);
}
#endif
if (SvMAGICAL(statement))
mg_get(statement);
for (i = 0; i < num_params; i++)
{
SV *param= ST(i+3);
if (SvMAGICAL(param))
mg_get(param);
}
#if MYSQL_VERSION_ID >= SERVER_PREPARE_VERSION

/*
Expand All @@ -307,18 +316,18 @@ do(dbh, statement, attr=Nullsv, ...)
SvTRUE(*svp) : imp_dbh->disable_fallback_for_server_prepare;

svp = DBD_ATTRIB_GET_SVP(attr, "async", 5);
async = (svp) ? *svp : &PL_sv_no;
async = (svp) ? SvTRUE(*svp) : FALSE;
}
if (DBIc_DBISTATE(imp_dbh)->debug >= 2)
PerlIO_printf(DBIc_LOGPIO(imp_dbh),
"mysql.xs do() use_server_side_prepare %d, async %d\n",
use_server_side_prepare, SvTRUE(async));
use_server_side_prepare, (async ? 1 : 0));

(void)hv_store((HV*)SvRV(dbh), "Statement", 9, SvREFCNT_inc(statement), 0);

get_statement(aTHX_ statement, enable_utf8, &str_ptr, &slen);

if(SvTRUE(async)) {
if(async) {
#if MYSQL_ASYNC
if (disable_fallback_for_server_prepare)
{
Expand Down Expand Up @@ -372,15 +381,11 @@ do(dbh, statement, attr=Nullsv, ...)
Handle binding supplied values to placeholders assume user has
passed the correct number of parameters
*/
int i;
num_params= items - 3;
Newz(0, bind, (unsigned int) num_params, MYSQL_BIND);

for (i = 0; i < num_params; i++)
{
SV *param= ST(i+3);
if (SvMAGICAL(param))
mg_get(param);
if (SvOK(param))
{
get_param(aTHX_ param, i+1, enable_utf8, false, (char **)&bind[i].buffer, &blen);
Expand Down Expand Up @@ -429,14 +434,10 @@ do(dbh, statement, attr=Nullsv, ...)
{
/* Handle binding supplied values to placeholders */
/* Assume user has passed the correct number of parameters */
int i;
num_params= items-3;
Newz(0, params, sizeof(*params)*num_params, struct imp_sth_ph_st);
for (i= 0; i < num_params; i++)
{
SV *param= ST(i+3);
if (SvMAGICAL(param))
mg_get(param);
if (SvOK(param))
get_param(aTHX_ param, i+1, enable_utf8, false, &params[i].value, &params[i].len);
else
Expand All @@ -459,7 +460,7 @@ do(dbh, statement, attr=Nullsv, ...)
result= 0;
}
#if MYSQL_VERSION_ID >= MULTIPLE_RESULT_SET_VERSION
if (retval != -2 && !SvTRUE(async)) /* -2 means error */
if (retval != -2 && !async) /* -2 means error */
{
/* more results? -1 = no, >0 = error, 0 = yes (keep looping) */
while ((next_result_rc= mysql_next_result(imp_dbh->pmysql)) == 0)
Expand Down Expand Up @@ -791,11 +792,11 @@ dbd_mysql_get_info(dbh, sql_info_type)
IV buffer_len;
#endif

if (SvMAGICAL(sql_info_type))
if (SvGMAGICAL(sql_info_type))
mg_get(sql_info_type);

if (SvOK(sql_info_type))
type = SvIV(sql_info_type);
type = SvIV_nomg(sql_info_type);
else
croak("get_info called with an invalied parameter");

Expand Down
Loading