Author: byterock
Date: Mon Jul 28 08:40:14 2008
New Revision: 11603
Modified:
dbd-oracle/trunk/dbdimp.c
dbd-oracle/trunk/dbdimp.h
dbd-oracle/trunk/oci8.c
Log:
latest changed from RC testing
Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c (original)
+++ dbd-oracle/trunk/dbdimp.c Mon Jul 28 08:40:14 2008
@@ -612,7 +612,7 @@
al16utf16_csid = OCINlsCharSetNameToId(imp_dbh->envhp,
(void*)"AL16UTF16");
#else /* (the old init code) NEW_OCI_INIT */
- /* this is now depricated and will be removed as we no longer support
<9.2 oracle
+ /* this is now depricated and will be removed as we no longer support
<9.2 oracle*/
/* XXX recent oracle docs recommend using OCIEnvCreate() instead of
*/
/* OCIInitialize + OCIEnvInit, we'd need ifdef's for
pre-OCIEnvNlsCreate */
OCIInitialize_log_stat(init_mode, 0, 0,0,0, status);
@@ -685,8 +685,8 @@
* BTW: NLS_NCHAR is set as follows: NSL_LANG=AL32UTF8
*/
if (DBIS->debug >= 3 || dbd_verbose >= 3) {
- char charsetname[OCI_NLS_MAXBUFSZ];
- char ncharsetname[OCI_NLS_MAXBUFSZ];
+ oratext charsetname[OCI_NLS_MAXBUFSZ];
+ oratext ncharsetname[OCI_NLS_MAXBUFSZ];
OCINlsCharSetIdToName(imp_dbh->envhp,charsetname,
sizeof(charsetname),charsetid );
OCINlsCharSetIdToName(imp_dbh->envhp,ncharsetname,
sizeof(ncharsetname),ncharsetid );
PerlIO_printf(DBILOGFP," charset id=%d, name=%s, ncharset id=%d,
name=%s"
@@ -1038,7 +1038,7 @@
dTHX;
dTHR;
OCIXMLType *xml = NULL;
- ub4 len;
+ STRLEN len;
sword status;
ub1 src_type;
dvoid* src_ptr = NULL;
Modified: dbd-oracle/trunk/dbdimp.h
==============================================================================
--- dbd-oracle/trunk/dbdimp.h (original)
+++ dbd-oracle/trunk/dbdimp.h Mon Jul 28 08:40:14 2008
@@ -277,7 +277,7 @@
void ora_free_templob _((SV *sth, imp_sth_t *imp_sth, OCILobLocator *lobloc));
int ora_dbtype_is_long _((int dbtype));
fb_ary_t *fb_ary_alloc _((ub4 bufl, int size));
-fb_ary_t *fb_ary_cb_alloc _((ub4 bufl,ub4 cb_bufl, int size));
+fb_ary_t *fb_ary_cb_alloc _((ub4 piece_size,ub4 max_len, int size));
int ora_db_reauthenticate _((SV *dbh, imp_dbh_t *imp_dbh, char *uid, char
*pwd));
Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Mon Jul 28 08:40:14 2008
@@ -199,8 +199,8 @@
case OCI_SB2_IND_PTR: return "SB2_IND_PTR";
/* unused */
case OCI_DATA_AT_EXEC: return "DATA_AT_EXEC"; /*
data at execute time */
case OCI_PIECEWISE: return "PIECEWISE"; /*
piecewise DMLs or fetch */
- case OCI_BIND_SOFT: return "BIND_SOFT"; /*
soft bind or define */
- case OCI_DEFINE_SOFT: return "DEFINE_SOFT"; /* soft
bind or define */
+/* case OCI_BIND_SOFT: return "BIND_SOFT"; soft
bind or define */
+/* case OCI_DEFINE_SOFT: return "DEFINE_SOFT"; soft
bind or define */
/* case OCI_IOV: return ""; 11g only release
1.23 me thinks For scatter gather bind/define */
}
@@ -243,8 +243,8 @@
/* nls validation suppression is on by default;*/
/* use OCI_ENABLE_NLS_VALIDATION to disable it */
case OCI_MUTEX_TRY: return "MUTEX_TRY"; /*
try and acquire mutex */
- case OCI_NCHAR_LITERAL_REPLACE_ON: return
"NCHAR_LITERAL_REPLACE_ON"; /* nchar literal replace on */
- case OCI_NCHAR_LITERAL_REPLACE_OFF:return
"NCHAR_LITERAL_REPLACE_OFF"; /* nchar literal replace off*/
+/* case OCI_NCHAR_LITERAL_REPLACE_ON: return
"NCHAR_LITERAL_REPLACE_ON"; nchar literal replace on */
+/* case OCI_NCHAR_LITERAL_REPLACE_OFF:return
"NCHAR_LITERAL_REPLACE_OFF"; nchar literal replace off*/
/* case OCI_ENABLE_NLS_VALIDATION: return
"ENABLE_NLS_VALIDATION"; enable nls validation */
/*------------------------OCIConnectionpoolCreate
Modes----------------------*/
case OCI_CPOOL_REINITIALIZE: return "CPOOL_REINITIALIZE";
@@ -2082,11 +2082,7 @@
sv_setpvn(dest_sv, (char*)fb_ary->cb_abuf,(STRLEN)actual_bufl);
if (fbh->ftype != SQLT_BIN){
- /**(fb_ary->cb_abuf+(actual_bufl))='\0'; /* add a null teminator
- sv_setpvn(dest_sv, (char*)fb_ary->cb_abuf,(STRLEN)actual_bufl);
-
- } else {
- sv_setpvn(dest_sv,
(char*)fb_ary->cb_abuf,(STRLEN)actual_bufl);*/
+
if (CSFORM_IMPLIES_UTF8(fbh->csform) ){ /* do the UTF 8 magic*/
SvUTF8_on(dest_sv);
}
