@@ -60,15 +60,17 @@ dbixs_revision(...)
60
60
#ifdef dbd_discon_all
61
61
62
62
# disconnect_all renamed and ALIAS'd to avoid length clash on VMS :-(
63
- void
63
+ bool
64
64
discon_all_(drh)
65
65
SV * drh
66
66
ALIAS:
67
67
disconnect_all = 1
68
68
CODE:
69
69
D_imp_drh(drh);
70
70
PERL_UNUSED_VAR(ix);
71
- ST(0) = dbd_discon_all(drh, imp_drh) ? &PL_sv_yes : &PL_sv_no;
71
+ RETVAL = dbd_discon_all(drh, imp_drh);
72
+ OUTPUT:
73
+ RETVAL
72
74
73
75
#endif /* dbd_discon_all */
74
76
@@ -102,7 +104,7 @@ data_sources(drh, attr = Nullsv)
102
104
MODULE = DBD::~DRIVER~ PACKAGE = DBD::~DRIVER~::db
103
105
104
106
105
- void
107
+ bool
106
108
_login(dbh, dbname, username, password, attribs=Nullsv)
107
109
SV * dbh
108
110
SV * dbname
@@ -118,14 +120,16 @@ _login(dbh, dbname, username, password, attribs=Nullsv)
118
120
char *p = (SvOK(password)) ? SvPV(password,lna) : (char*)"";
119
121
#endif
120
122
#ifdef dbd_db_login6_sv
121
- ST(0) = dbd_db_login6_sv(dbh, imp_dbh, dbname, username, password, attribs) ? &PL_sv_yes : &PL_sv_no ;
123
+ RETVAL = dbd_db_login6_sv(dbh, imp_dbh, dbname, username, password, attribs);
122
124
#elif defined(dbd_db_login6)
123
- ST(0) = dbd_db_login6(dbh, imp_dbh, SvPV_nolen(dbname), u, p, attribs) ? &PL_sv_yes : &PL_sv_no ;
125
+ RETVAL = dbd_db_login6(dbh, imp_dbh, SvPV_nolen(dbname), u, p, attribs);
124
126
#else
125
127
PERL_UNUSED_ARG(attribs);
126
- ST(0) = dbd_db_login( dbh, imp_dbh, SvPV_nolen(dbname), u, p) ? &PL_sv_yes : &PL_sv_no ;
128
+ RETVAL = dbd_db_login( dbh, imp_dbh, SvPV_nolen(dbname), u, p);
127
129
#endif
128
130
}
131
+ OUTPUT:
132
+ RETVAL
129
133
130
134
131
135
void
@@ -297,33 +301,38 @@ last_insert_id(dbh, catalog=&PL_sv_undef, schema=&PL_sv_undef, table=&PL_sv_unde
297
301
CODE:
298
302
{
299
303
D_imp_dbh(dbh);
300
- ST(0) = dbd_db_last_insert_id(dbh, imp_dbh, catalog, schema, table, field, attr);
304
+ SV *ret = dbd_db_last_insert_id(dbh, imp_dbh, catalog, schema, table, field, attr);
305
+ ST(0) = ret;
301
306
}
302
307
303
308
#endif
304
309
305
310
306
- void
311
+ bool
307
312
commit(dbh)
308
313
SV * dbh
309
314
CODE:
310
315
D_imp_dbh(dbh);
311
316
if (DBIc_has(imp_dbh,DBIcf_AutoCommit) && DBIc_WARN(imp_dbh))
312
317
warn("commit ineffective with AutoCommit enabled");
313
- ST(0) = dbd_db_commit(dbh, imp_dbh) ? &PL_sv_yes : &PL_sv_no;
318
+ RETVAL = dbd_db_commit(dbh, imp_dbh);
319
+ OUTPUT:
320
+ RETVAL
314
321
315
322
316
- void
323
+ bool
317
324
rollback(dbh)
318
325
SV * dbh
319
326
CODE:
320
327
D_imp_dbh(dbh);
321
328
if (DBIc_has(imp_dbh,DBIcf_AutoCommit) && DBIc_WARN(imp_dbh))
322
329
warn("rollback ineffective with AutoCommit enabled");
323
- ST(0) = dbd_db_rollback(dbh, imp_dbh) ? &PL_sv_yes : &PL_sv_no;
330
+ RETVAL = dbd_db_rollback(dbh, imp_dbh);
331
+ OUTPUT:
332
+ RETVAL
324
333
325
334
326
- void
335
+ bool
327
336
disconnect(dbh)
328
337
SV * dbh
329
338
CODE:
@@ -340,8 +349,10 @@ disconnect(dbh)
340
349
SvPV(dbh,lna), (int)DBIc_ACTIVE_KIDS(imp_dbh), plural,
341
350
"(either destroy statement handles or call finish on them before disconnecting)");
342
351
}
343
- ST(0) = dbd_db_disconnect(dbh, imp_dbh) ? &PL_sv_yes : &PL_sv_no ;
352
+ RETVAL = dbd_db_disconnect(dbh, imp_dbh);
344
353
DBIc_ACTIVE_off(imp_dbh); /* ensure it's off, regardless */
354
+ OUTPUT:
355
+ RETVAL
345
356
346
357
347
358
void
@@ -475,7 +486,7 @@ data_sources(dbh, attr = Nullsv)
475
486
MODULE = DBD::~DRIVER~ PACKAGE = DBD::~DRIVER~::st
476
487
477
488
478
- void
489
+ bool
479
490
_prepare(sth, statement, attribs=Nullsv)
480
491
SV * sth
481
492
SV * statement
@@ -485,11 +496,13 @@ _prepare(sth, statement, attribs=Nullsv)
485
496
D_imp_sth(sth);
486
497
DBD_ATTRIBS_CHECK("_prepare", sth, attribs);
487
498
#ifdef dbd_st_prepare_sv
488
- ST(0) = dbd_st_prepare_sv(sth, imp_sth, statement, attribs) ? &PL_sv_yes : &PL_sv_no ;
499
+ RETVAL = dbd_st_prepare_sv(sth, imp_sth, statement, attribs);
489
500
#else
490
- ST(0) = dbd_st_prepare(sth, imp_sth, SvPV_nolen(statement), attribs) ? &PL_sv_yes : &PL_sv_no ;
501
+ RETVAL = dbd_st_prepare(sth, imp_sth, SvPV_nolen(statement), attribs);
491
502
#endif
492
503
}
504
+ OUTPUT:
505
+ RETVAL
493
506
494
507
495
508
#ifdef dbd_st_rows
@@ -506,7 +519,7 @@ rows(sth)
506
519
507
520
#ifdef dbd_st_bind_col
508
521
509
- void
522
+ bool
510
523
bind_col(sth, col, ref, attribs=Nullsv)
511
524
SV * sth
512
525
SV * col
@@ -531,20 +544,21 @@ bind_col(sth, col, ref, attribs=Nullsv)
531
544
}
532
545
}
533
546
switch(dbd_st_bind_col(sth, imp_sth, col, ref, sql_type, attribs)) {
534
- case 2: ST(0) = &PL_sv_yes; /* job done completely */
547
+ case 2: RETVAL = TRUE; /* job done completely */
535
548
break;
536
549
case 1: /* fallback to DBI default */
537
- ST(0) = (DBIc_DBISTATE(imp_sth)->bind_col(sth, col, ref, attribs))
538
- ? &PL_sv_yes : &PL_sv_no;
550
+ RETVAL = DBIc_DBISTATE(imp_sth)->bind_col(sth, col, ref, attribs);
539
551
break;
540
- default: ST(0) = &PL_sv_no; /* dbd_st_bind_col has called set_err */
552
+ default: RETVAL = FALSE; /* dbd_st_bind_col has called set_err */
541
553
break;
542
554
}
543
555
}
556
+ OUTPUT:
557
+ RETVAL
544
558
545
559
#endif /* dbd_st_bind_col */
546
560
547
- void
561
+ bool
548
562
bind_param(sth, param, value, attribs=Nullsv)
549
563
SV * sth
550
564
SV * param
@@ -568,12 +582,13 @@ bind_param(sth, param, value, attribs=Nullsv)
568
582
DBD_ATTRIB_GET_IV(attribs, "TYPE",4, svp, sql_type);
569
583
}
570
584
}
571
- ST(0) = dbd_bind_ph(sth, imp_sth, param, value, sql_type, attribs, FALSE, 0)
572
- ? &PL_sv_yes : &PL_sv_no;
585
+ RETVAL = dbd_bind_ph(sth, imp_sth, param, value, sql_type, attribs, FALSE, 0);
573
586
}
587
+ OUTPUT:
588
+ RETVAL
574
589
575
590
576
- void
591
+ bool
577
592
bind_param_inout(sth, param, value_ref, maxlen, attribs=Nullsv)
578
593
SV * sth
579
594
SV * param
@@ -603,9 +618,10 @@ bind_param_inout(sth, param, value_ref, maxlen, attribs=Nullsv)
603
618
DBD_ATTRIB_GET_IV(attribs, "TYPE",4, svp, sql_type);
604
619
}
605
620
}
606
- ST(0) = dbd_bind_ph(sth, imp_sth, param, value, sql_type, attribs, TRUE, maxlen)
607
- ? &PL_sv_yes : &PL_sv_no;
621
+ RETVAL = dbd_bind_ph(sth, imp_sth, param, value, sql_type, attribs, TRUE, maxlen);
608
622
}
623
+ OUTPUT:
624
+ RETVAL
609
625
610
626
611
627
void
@@ -641,7 +657,8 @@ execute_for_fetch(sth, fetch_tuple_sub, tuple_status = Nullsv)
641
657
CODE:
642
658
{
643
659
D_imp_sth(sth);
644
- ST(0) = dbd_st_execute_for_fetch(sth, imp_sth, fetch_tuple_sub, tuple_status);
660
+ SV *ret = dbd_st_execute_for_fetch(sth, imp_sth, fetch_tuple_sub, tuple_status);
661
+ ST(0) = ret;
645
662
}
646
663
647
664
#endif
@@ -660,7 +677,8 @@ last_insert_id(sth, catalog=&PL_sv_undef, schema=&PL_sv_undef, table=&PL_sv_unde
660
677
CODE:
661
678
{
662
679
D_imp_sth(sth);
663
- ST(0) = dbd_st_last_insert_id(sth, imp_sth, catalog, schema, table, field, attr);
680
+ SV *ret = dbd_st_last_insert_id(sth, imp_sth, catalog, schema, table, field, attr);
681
+ ST(0) = ret;
664
682
}
665
683
666
684
#endif
@@ -717,7 +735,7 @@ fetchall_arrayref(sth, slice=&PL_sv_undef, batch_row_count=&PL_sv_undef)
717
735
}
718
736
719
737
720
- void
738
+ bool
721
739
finish(sth)
722
740
SV * sth
723
741
CODE:
@@ -734,10 +752,12 @@ finish(sth)
734
752
XSRETURN_YES;
735
753
}
736
754
#ifdef dbd_st_finish3
737
- ST(0) = dbd_st_finish3(sth, imp_sth, 0) ? &PL_sv_yes : &PL_sv_no ;
755
+ RETVAL = dbd_st_finish3(sth, imp_sth, 0);
738
756
#else
739
- ST(0) = dbd_st_finish(sth, imp_sth) ? &PL_sv_yes : &PL_sv_no ;
757
+ RETVAL = dbd_st_finish(sth, imp_sth);
740
758
#endif
759
+ OUTPUT:
760
+ RETVAL
741
761
742
762
743
763
void
0 commit comments