Author: byterock
Date: Fri May 2 09:34:53 2008
New Revision: 11181
Modified:
dbd-oracle/trunk/Oracle.xs
dbd-oracle/trunk/dbdimp.c
dbd-oracle/trunk/oci8.c
dbd-oracle/trunk/ocitrace.h
Log:
removed 8 reff stuff
Modified: dbd-oracle/trunk/Oracle.xs
==============================================================================
--- dbd-oracle/trunk/Oracle.xs (original)
+++ dbd-oracle/trunk/Oracle.xs Fri May 2 09:34:53 2008
@@ -308,7 +308,7 @@
STRLEN data_len; /* bytes not chars */
dvoid *bufp;
sword status;
-#if defined(ORA_OCI_8) || !defined(OCI_HTYPE_DIRPATH_FN_CTX) /* Oracle is <
9.0 */
+#if !defined(OCI_HTYPE_DIRPATH_FN_CTX) /* Oracle is < 9.0 */
ub4 startp;
#endif
ub1 csform;
@@ -339,7 +339,6 @@
#endif /* OCI_ATTR_CHARSET_ID */
/* if data is utf8 but charset isn't then switch to utf8 csid */
csid = (SvUTF8(data) && !CS_IS_UTF8(csid)) ? utf8_csid :
CSFORM_IMPLIED_CSID(csform);
-#if !defined(ORA_OCI_8) && defined(OCI_HTYPE_DIRPATH_FN_CTX) /* Oracle is >=
9.0 */
OCILobWriteAppend_log_stat(imp_dbh->svchp, imp_dbh->errhp, locator,
&amtp, bufp, (ub4)data_len, OCI_ONE_PIECE,
NULL, NULL,
@@ -351,31 +350,6 @@
else {
ST(0) = &sv_yes;
}
-#else
- OCILobGetLength_log_stat(imp_dbh->svchp, imp_dbh->errhp, locator, &startp,
status);
- if (status != OCI_SUCCESS) {
- oci_error(dbh, imp_dbh->errhp, status, "OCILobGetLength");
- ST(0) = &sv_undef;
- } else {
- /* start one after the end -- the first position in the LOB is 1 */
- startp++;
- if (DBIS->debug >= 2 )
- PerlIO_printf(DBILOGFP, " Calling OCILobWrite with csid=%d
csform=%d\n",csid, csform );
- OCILobWrite_log_stat(imp_dbh->svchp, imp_dbh->errhp, locator,
- &amtp, startp,
- bufp, (ub4)data_len, OCI_ONE_PIECE,
- NULL, NULL,
- csid, csform , status);
- if (status != OCI_SUCCESS) {
- oci_error(dbh, imp_dbh->errhp, status, "OCILobWrite");
- ST(0) = &sv_undef;
- }
- else {
- ST(0) = &sv_yes;
- }
- }
-#endif
-
void
ora_lob_read(dbh, locator, offset, length)
Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c (original)
+++ dbd-oracle/trunk/dbdimp.c Fri May 2 09:34:53 2008
@@ -629,7 +629,6 @@
OCIHandleAlloc_ok(imp_dbh->envhp, &imp_dbh->errhp, OCI_HTYPE_ERROR,
status);
#ifndef NEW_OCI_INIT /* have to get charsetid & ncharsetid the old way */
-#if defined(OCI_ATTR_ENV_CHARSET_ID) && !defined(ORA_OCI_8) /* Oracle 9.0+
*/
OCIAttrGet_log_stat(imp_dbh->envhp, OCI_HTYPE_ENV, &charsetid, (ub4)0 ,
OCI_ATTR_ENV_CHARSET_ID, imp_dbh->errhp, status);
if (status != OCI_SUCCESS) {
@@ -642,21 +641,6 @@
oci_error(dbh, imp_dbh->errhp, status, "OCIAttrGet
OCI_ATTR_ENV_NCHARSET_ID");
return 0;
}
-#else /* Oracle 8.x */
- {
- /* We don't have a way to get the actual charsetid & ncharsetid in use
- * but we only care about UTF8 so we'll just check for that and use the
- * the hardcoded utf8_csid if found
- */
- char buf[81];
- char *nls = ora_env_var("NLS_LANG", buf, sizeof(buf)-1);
- if (nls && strlen(nls) >= 4 && !strcasecmp(nls + strlen(nls) - 4,
"utf8"))
- charsetid = utf8_csid;
- nls = ora_env_var("NLS_NCHAR", buf, sizeof(buf)-1);
- if (nls && strlen(nls) >= 4 && !strcasecmp(nls + strlen(nls) - 4,
"utf8"))
- ncharsetid = utf8_csid;
- }
-#endif
#endif
/* At this point we have charsetid & ncharsetid
Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Fri May 2 09:34:53 2008
@@ -868,7 +868,6 @@
}
}
-#if !defined(ORA_OCI_8)
/* create temporary LOB for PL/SQL placeholder */
else if (imp_sth->stmt_type == OCI_STMT_BEGIN ||
@@ -924,7 +923,6 @@
}
}
}
-#endif
return 1;
}
Modified: dbd-oracle/trunk/ocitrace.h
==============================================================================
--- dbd-oracle/trunk/ocitrace.h (original)
+++ dbd-oracle/trunk/ocitrace.h Fri May 2 09:34:53 2008
@@ -335,7 +335,6 @@
oci_status_name(stat)),stat : stat
/*Added by JPS for Jeffrey.Klein*/
-#if !defined(ORA_OCI_8)
#define OCILobCreateTemporary_log_stat(sv,eh,lh,csi,csf,lt,ca,dur,stat) \
stat=OCILobCreateTemporary(sv,eh,lh,csi,csf,lt,ca,dur);
\
(DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP,
\
@@ -343,36 +342,22 @@
OciTp, (void*)sv,(void*)eh,(void*)lh, \
ul_t(csi),ul_t(csf),ul_t(lt),ul_t(ca),ul_t(dur), \
oci_status_name(stat)),stat : stat
-#else
-#define OCILobCreateTemporary_log_stat(sv,eh,lh,stat) \
- stat=0 /* Actually, this should be a compile error */
-#endif
-
/*end add*/
-#if !defined(ORA_OCI_8)
#define OCILobFreeTemporary_log_stat(sv,eh,lh,stat) \
stat=OCILobFreeTemporary(sv,eh,lh);
\
(DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP,
\
"%sLobFreeTemporary(%p,%p,%p)=%s\n", \
OciTp, (void*)sv,(void*)eh,(void*)lh, \
oci_status_name(stat)),stat : stat
-#else
-#define OCILobFreeTemporary_log_stat(sv,eh,lh,stat) \
- stat=0
-#endif
-#if !defined(ORA_OCI_8)
#define OCILobIsTemporary_log_stat(ev,eh,lh,istemp,stat)
\
stat=OCILobIsTemporary(ev,eh,lh,istemp);
\
(DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP,
\
"%sLobIsTemporary(%p,%p,%p,%p)=%s\n", \
OciTp, (void*)ev,(void*)eh,(void*)lh,(void*)istemp, \
oci_status_name(stat)),stat : stat
-#else
-#define OCILobIsTemporary_log_stat(ev,eh,lh,istemp,stat) \
- stat=0
-#endif
+
/*Added by JPS for Jeffrey.Klein */
#define OCILobLocatorAssign_log_stat(sv,eh,src,dest,stat) \
@@ -439,21 +424,12 @@
OciTp, (void*)sv,(void*)st,(void*)eh,ul_t((i)), \
ul_t((ro)),(void*)(si),(void*)(so),ul_t((md)), \
oci_status_name(stat)),stat : stat
-#if !defined(USE_ORA_OCI_STMNT_FETCH)
#define OCIStmtFetch_log_stat(sh,eh,nr,or,os,stat) \
stat=OCIStmtFetch2(sh,eh,nr,or,os,OCI_DEFAULT);
\
(DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP,
\
"%sStmtFetch(%p,%p,%lu,%u,%lu)=%s\n",
\
OciTp, (void*)sh,(void*)eh,ul_t(nr),(ub2)or,(ub2)os,
\
oci_status_name(stat)),stat : stat
-#else
-#define OCIStmtFetch_log_stat(sh,eh,nr,or,os,stat) \
- stat=OCIStmtFetch(sh,eh,nr,or,OCI_DEFAULT);
\
- (DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP,
\
- "%sStmtFetch(%p,%p,%lu,%lu)=%s\n", \
- OciTp, (void*)sh,(void*)eh,ul_t(nr),(ub2)or, \
- oci_status_name(stat)),stat : stat
-#endif
#define OCIStmtPrepare_log_stat(sh,eh,s1,sl,l,m,stat) \
stat=OCIStmtPrepare(sh,eh,s1,sl,l,m); \
