Author: byterock
Date: Mon Mar 31 05:20:34 2008
New Revision: 11026
Modified:
dbd-oracle/trunk/Oracle.h
dbd-oracle/trunk/Oracle.pm
dbd-oracle/trunk/dbdimp.c
dbd-oracle/trunk/oci.def
dbd-oracle/trunk/oci8.c
Log:
Changes from martin evans
Modified: dbd-oracle/trunk/Oracle.h
==============================================================================
--- dbd-oracle/trunk/Oracle.h (original)
+++ dbd-oracle/trunk/Oracle.h Mon Mar 31 05:20:34 2008
@@ -67,7 +67,7 @@
int dbd_db_commit _((SV *dbh, imp_dbh_t *imp_dbh));
int dbd_db_rollback _((SV *dbh, imp_dbh_t *imp_dbh));
int dbd_db_disconnect _((SV *dbh, imp_dbh_t *imp_dbh));
-void dbd_db_destroy _((SV *dbh, imp_dbh_t *imp_dbh));
+void dbd_db_destroy _((SV *dbh, imp_dbh_t *imp_dbh));
int dbd_db_STORE_attrib _((SV *dbh, imp_dbh_t *imp_dbh, SV *keysv, SV
*valuesv));
SV *dbd_db_FETCH_attrib _((SV *dbh, imp_dbh_t *imp_dbh, SV *keysv));
@@ -79,8 +79,8 @@
AV *dbd_st_fetch _((SV *sth, imp_sth_t *imp_sth));
int dbd_st_finish _((SV *sth, imp_sth_t *imp_sth));
-void dbd_st_destroy _((SV *sth, imp_sth_t *imp_sth));
-int dbd_st_blob_read _((SV *sth, imp_sth_t *imp_sth,
+void dbd_st_destroy _((SV *sth, imp_sth_t *imp_sth));
+int dbd_st_blob_read _((SV *sth, imp_sth_t *imp_sth,
int field, long offset, long len, SV *destrv, long destoffset));
int dbd_st_STORE_attrib _((SV *sth, imp_sth_t *imp_sth, SV *keysv, SV
*valuesv));
SV *dbd_st_FETCH_attrib _((SV *sth, imp_sth_t *imp_sth, SV *keysv));
@@ -88,10 +88,10 @@
SV *param, SV *value, IV sql_type, SV *attribs, int is_inout,
IV maxlen));
int dbd_db_login6 _((SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char
*user, char *pwd, SV *attr));
-int dbd_describe _((SV *sth, imp_sth_t *imp_sth));
-ub4 ora_blob_read_piece _((SV *sth, imp_sth_t *imp_sth, imp_fbh_t *fbh, SV
*dest_sv,
+int dbd_describe _((SV *sth, imp_sth_t *imp_sth));
+ub4 ora_blob_read_piece _((SV *sth, imp_sth_t *imp_sth, imp_fbh_t *fbh, SV
*dest_sv,
long offset, UV len, long destoffset));
-ub4 ora_blob_read_mb_piece _((SV *sth, imp_sth_t *imp_sth, imp_fbh_t *fbh,
SV *dest_sv,
+ub4 ora_blob_read_mb_piece _((SV *sth, imp_sth_t *imp_sth, imp_fbh_t *fbh,
SV *dest_sv,
long offset, UV len, long destoffset));
/* Oracle types */
Modified: dbd-oracle/trunk/Oracle.pm
==============================================================================
--- dbd-oracle/trunk/Oracle.pm (original)
+++ dbd-oracle/trunk/Oracle.pm Mon Mar 31 05:20:34 2008
@@ -1254,7 +1254,7 @@
=head2 Connect Attributes
-=over4
+=over 4
=item ora_session_mode
Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c (original)
+++ dbd-oracle/trunk/dbdimp.c Mon Mar 31 05:20:34 2008
@@ -1063,7 +1063,7 @@
- status= OCIXMLTypeCreateFromSrc(imp_dbh->svchp,
+ status = OCIXMLTypeCreateFromSrc(imp_dbh->svchp,
imp_dbh->errhp,
(OCIDuration)OCI_DURATION_CALLOUT,
(ub1)src_type,
@@ -2861,8 +2861,7 @@
D_imp_dbh_from_sth;
sword status;
int is_select = (imp_sth->stmt_type == OCI_STMT_SELECT);
- ub4 exe_mode = imp_sth->exe_mode;
-
+
if (debug >= 2)
PerlIO_printf(DBILOGFP, " dbd_st_execute %s (out%d, lob%d)...\n",
@@ -3260,7 +3259,7 @@
if (SvTYPE(sv) == SVt_RV && SvTYPE(SvRV(sv)) ==
SVt_PVAV) {
AV *av = (AV*)SvRV(sv);
I32 avlen = AvFILL(av);
- for (j=0;j<=av_len(av);j++){
+ for (j=0;j<=avlen;j++){
SV *sv2 = *av_fetch(av, j, 1);
dbd_phs_avsv_complete(phs, j, debug);
}
Modified: dbd-oracle/trunk/oci.def
==============================================================================
--- dbd-oracle/trunk/oci.def (original)
+++ dbd-oracle/trunk/oci.def Mon Mar 31 05:20:34 2008
@@ -230,6 +230,7 @@
OCIStmtBindByPos
OCIStmtExecute
OCIStmtFetch
+OCIStmtFetch2
OCIStmtGetBindInfo
OCIStmtGetPieceInfo
OCIStmtPrepare
Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Mon Mar 31 05:20:34 2008
@@ -1379,8 +1379,8 @@
if (typecode == OCI_TYPECODE_TIMESTAMP_TZ || typecode ==
OCI_TYPECODE_TIMESTAMP_LTZ){
char s_tz_hour[3]="000";
char s_tz_min[3]="000";
- sb1 tz_hour;
- sb1 tz_minute;
+ ub1 tz_hour;
+ ub1 tz_minute;
status = OCIDateTimeGetTimeZoneOffset
(fbh->imp_sth->envhp,
fbh->imp_sth->errhp,
*(OCIDateTime**)attr_value,
