Author: byterock
Date: Fri Dec 5 07:45:43 2008
New Revision: 12139
Modified:
dbd-oracle/trunk/Changes
dbd-oracle/trunk/MANIFEST
dbd-oracle/trunk/Oracle.h
dbd-oracle/trunk/Oracle.pm
dbd-oracle/trunk/Oracle.xs
dbd-oracle/trunk/dbdimp.c
dbd-oracle/trunk/oci8.c
dbd-oracle/trunk/typemap
Log:
recent Changes, raised the dbd_verbose levels, some typos in the pod and a
change to the MANIFEST by dropping META.YML
Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes (original)
+++ dbd-oracle/trunk/Changes Fri Dec 5 07:45:43 2008
@@ -1,4 +1,5 @@
=head1 Changes in DBD-Oracle 1.23(svn rev #####)
+ Standerdized the dbd_verbose levels so they are all 3 and over. from John
Scoles
Added private statement functions ora_stmt_type_name and ora_stmt_type from
John Scoles
Update to POD from Chris Underhill
Added README.win64.txt with content from Alex Buttery
Modified: dbd-oracle/trunk/MANIFEST
==============================================================================
--- dbd-oracle/trunk/MANIFEST (original)
+++ dbd-oracle/trunk/MANIFEST Fri Dec 5 07:45:43 2008
@@ -10,7 +10,6 @@
lib/DBD/Oracle/GetInfo.pm
Makefile.PL
MANIFEST
-META.yml Module meta-data (added by MakeMaker)
mk.pm
mkta.pl
oci.def OCI.DLL export declarations
Modified: dbd-oracle/trunk/Oracle.h
==============================================================================
--- dbd-oracle/trunk/Oracle.h (original)
+++ dbd-oracle/trunk/Oracle.h Fri Dec 5 07:45:43 2008
@@ -39,6 +39,7 @@
#include <ocidfn.h>
#include <orid.h>
#include <ori.h>
+
/* ------ end of Oracle include files ------ */
Modified: dbd-oracle/trunk/Oracle.pm
==============================================================================
--- dbd-oracle/trunk/Oracle.pm (original)
+++ dbd-oracle/trunk/Oracle.pm Fri Dec 5 07:45:43 2008
@@ -993,7 +993,7 @@
+---------------------+----+-------------+---------+------+--------+
| 1.20 | N | N | N | Y | Y |
+---------------------+----+-------------+---------+------+--------+
- | 1.21 | N | N | N | Y | Y |
+ | 1.21 | N | N | N | N | Y |
+---------------------+----+-------------+---------+------+--------+
| 1.22 | N | N | N | N | Y |
+---------------------+----+-------------+---------+------+--------+
@@ -1965,7 +1965,7 @@
The NLS_NCHAR environment variable can be used to define a different
character set for 'national' (NCHAR) character types.
-Both UTF8 and AL32UTF32 can be used in NLS_LANG and NLS_NCHAR.
+Both UTF8 and AL32UTF8 can be used in NLS_LANG and NLS_NCHAR.
For example:
NLS_LANG=AMERICAN_AMERICA.UTF8
Modified: dbd-oracle/trunk/Oracle.xs
==============================================================================
--- dbd-oracle/trunk/Oracle.xs (original)
+++ dbd-oracle/trunk/Oracle.xs Fri Dec 5 07:45:43 2008
@@ -143,10 +143,6 @@
ST(0) = (av) ? sv_2mortal(newRV((SV *)av)) : &PL_sv_undef;
}
-
-
-
-
void
ora_bind_param_inout_array(sth, param, av_ref, maxlen, attribs)
SV * sth
@@ -179,6 +175,7 @@
? &sv_yes : &sv_no;
}
+
void
ora_fetch(sth)
SV * sth
@@ -399,6 +396,9 @@
ST(0) = &sv_yes;
}
+
+
+
void
ora_lob_read(dbh, locator, offset, length)
SV *dbh
Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c (original)
+++ dbd-oracle/trunk/dbdimp.c Fri Dec 5 07:45:43 2008
@@ -93,7 +93,7 @@
&& eg_status != OCI_INVALID_HANDLE
&& recno < 100
) {
- if (debug >= 4 || recno>1/*XXX temp*/ || dbd_verbose >= 4)
+ if (debug >= 4 || recno>1/*XXX temp*/ || dbd_verbose >= 4 )
PerlIO_printf(DBILOGFP, " OCIErrorGet after %s (er%ld:%s): %d,
%ld: %s\n",
what ? what : "<NULL>", (long)recno,
(eg_status==OCI_SUCCESS) ? "ok" :
oci_status_name(eg_status),
@@ -384,14 +384,14 @@
if (DBIc_has(imp_dbh, DBIcf_IMPSET)) {
/* dbi_imp_data from take_imp_data */
if (DBIc_has(imp_dbh, DBIcf_ACTIVE)) {
- if (DBIS->debug >= 2 || dbd_verbose >= 2)
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, "dbd_db_login6 skip connect\n");
/* tell our parent we've adopted an active child */
++DBIc_ACTIVE_KIDS(DBIc_PARENT_COM(imp_dbh));
return 1;
}
/* not ACTIVE so connect not skipped */
- if (DBIS->debug >= 2 || dbd_verbose >= 2 )
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
"dbd_db_login6 IMPSET but not ACTIVE so connect not skipped\n");
}
@@ -429,7 +429,7 @@
shared_dbh -> refcnt++ ;
imp_dbh -> shared_dbh_priv_sv = shared_dbh_priv_sv ;
imp_dbh -> shared_dbh = shared_dbh ;
- if (DBIS->debug >= 2 || dbd_verbose >= 2)
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_db_login: use
shared Oracle database handles.\n");
} else {
shared_dbh = NULL ;
@@ -444,7 +444,7 @@
imp_dbh->get_oci_handle = oci_db_handle;
- if (DBIS->debug >= 6 || dbd_verbose >= 7)
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 )
dump_env_to_trace();
if ((svp=DBD_ATTRIB_GET_SVP(attr, "ora_envhp", 9)) && SvOK(*svp)) {
@@ -693,7 +693,7 @@
* be distinct if NLS_LANG and NLS_NCHAR are both used.
* BTW: NLS_NCHAR is set as follows: NSL_LANG=AL32UTF8
*/
- if (DBIS->debug >= 3 || dbd_verbose >= 3) {
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 ) {
oratext charsetname[OCI_NLS_MAXBUFSZ];
oratext ncharsetname[OCI_NLS_MAXBUFSZ];
OCINlsCharSetIdToName(imp_dbh->envhp,charsetname,
sizeof(charsetname),charsetid );
@@ -1072,13 +1072,13 @@
len = SvLEN(source);
bufp = SvPV(source, len);
- if (DBIS->debug >=3 || dbd_verbose >= 3)
+ if (DBIS->debug >=3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " creating xml from string that is %d
long\n",len);
if(len > MAX_OCISTRING_LEN) {
src_type = OCI_XMLTYPE_CREATE_CLOB;
- if (DBIS->debug >=5 || dbd_verbose >=5)
+ if (DBIS->debug >=5 || dbd_verbose >= 5 )
PerlIO_printf(DBILOGFP, " use a temp lob locator for large xml \n");
OCIDescriptorAlloc_ok(imp_dbh->envhp, &src_ptr, OCI_DTYPE_LOB);
@@ -1103,7 +1103,7 @@
} else {
src_type = OCI_XMLTYPE_CREATE_OCISTRING;
- if (DBIS->debug >=5 || dbd_verbose >=5 )
+ if (DBIS->debug >=5 || dbd_verbose >= 5 )
PerlIO_printf(DBILOGFP, " use a OCIStringAssignText for small xml \n");
@@ -1266,7 +1266,7 @@
*dest = '\0';
if (imp_sth->all_params_hv) {
DBIc_NUM_PARAMS(imp_sth) = (int)HvKEYS(imp_sth->all_params_hv);
- if (DBIS->debug >= 2 || dbd_verbose >=2 )
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_preparse scanned %d distinct
placeholders\n",
(int)DBIc_NUM_PARAMS(imp_sth));
}
@@ -1403,7 +1403,7 @@
}
arr=(AV*)(SvRV(phs->sv));
- if (trace_level >= 2 || dbd_verbose >= 2){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_varchar2_table():
array_numstruct=%d\n",
phs->array_numstruct);
}
@@ -1415,7 +1415,7 @@
int numarrayentries=av_len( arr );
if( numarrayentries >= 0 ){
phs->array_numstruct = numarrayentries+1;
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_varchar2_table():
array_numstruct=%d (calculated) \n",
phs->array_numstruct);
}
@@ -1423,7 +1423,7 @@
}
/* Fix charset */
csform = phs->csform;
- if (trace_level >= 2 || dbd_verbose >= 2){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_varchar2_table(): original
csform=%d\n",
(int)csform);
}
@@ -1457,14 +1457,14 @@
if( length+1 > maxlen ){
maxlen=length+1;
}
- if (trace_level >= 3 || dbd_verbose >= 3 ){
+ if (trace_level >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_varchar2_table(): length(array[%d])=%d\n",
i,(int)length);
}
}
if(SvUTF8(item) ){
flag_data_is_utf8=1;
- if (trace_level >= 3 || dbd_verbose >= 3 ){
+ if (trace_level >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_varchar2_table(): is_utf8(array[%d])=true\n", i);
}
if (csform != SQLCS_NCHAR) {
@@ -1474,14 +1474,14 @@
else if (CSFORM_IMPLIES_UTF8(SQLCS_IMPLICIT))
csform = SQLCS_IMPLICIT;
/* else leave csform == 0 */
- if (trace_level || dbd_verbose >= 1 )
+ if (trace_level || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_varchar2_table(): rebinding %s with UTF8 value %s", phs->name,
(csform == SQLCS_NCHAR) ? "so setting
csform=SQLCS_IMPLICIT" :
(csform == SQLCS_IMPLICIT) ? "so setting
csform=SQLCS_NCHAR" :
"but neither CHAR nor NCHAR are unicode\n");
}
}else{
- if (trace_level >= 3 || dbd_verbose >= 3 ){
+ if (trace_level >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_varchar2_table(): is_utf8(array[%d])=false\n", i);
}
}
@@ -1489,12 +1489,12 @@
}
if( phs->maxlen <=0 ){
phs->maxlen=maxlen;
- if (trace_level >= 2 || dbd_verbose >= 2){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_varchar2_table():
phs->maxlen calculated =%ld\n",
(long)maxlen);
}
} else{
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_varchar2_table(): phs->maxlen forsed =%ld\n",
(long)maxlen);
}
@@ -1525,7 +1525,7 @@
croak("Unable to bind %s - %d structures by %d bytes requires too much
memory.",
phs->name, need_allocate_rows, buflen );
}else{
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_varchar2_table():
ora_realloc_phs_array(,need_allocate_rows=%d,buflen=%d) succeeded.\n",
need_allocate_rows,buflen);
}
@@ -1558,7 +1558,7 @@
phs->array_buf[ phs->maxlen*i + itemlen ]=0;
phs->array_indicators[i]=0;
phs->array_lengths[i]=itemlen+1; /* Zero byte */
- if (trace_level >= 3 || dbd_verbose >= 3 ){
+ if (trace_level >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_varchar2_table(): "
"Copying length=%d array[%d]='%s'.\n",
itemlen,i,str);
@@ -1566,7 +1566,7 @@
}else{
/* Mark NULL */
phs->array_indicators[i]=1;
- if (trace_level >= 3 || dbd_verbose >= 3 ){
+ if (trace_level >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_varchar2_table(): "
"Copying length=%d array[%d]=NULL (length==0 or
! str) .\n",
itemlen,i);
@@ -1575,7 +1575,7 @@
}else{
/* Mark NULL */
phs->array_indicators[i]=1;
- if (trace_level >= 3 || dbd_verbose >= 3 ){
+ if (trace_level >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_varchar2_table(): "
"Copying length=? array[%d]=NULL av_fetch
failed.\n", i);
}
@@ -1632,7 +1632,7 @@
if ( flag_data_is_utf8 && !CS_IS_UTF8(csid))
csid = utf8_csid; /* not al32utf8_csid here on purpose */
- if (trace_level >= 3 || dbd_verbose >= 3 )
+ if (trace_level >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_varchar2_table(): bind
%s <== %s "
"(%s, %s, csid %d->%d->%d, ftype %d, csform %d->%d,
maxlen %lu, maxdata_size %lu)\n",
phs->name, neatsvpv(phs->sv,0),
@@ -1677,7 +1677,7 @@
croak("dbd_phs_ora_varchar2_table_fixup_after_execute(): bad bind
variable. ARRAY reference required, but got %s for '%s'.",
neatsvpv(phs->sv,0), phs->name);
}
- if (trace_level >= 1 || dbd_verbose >= 1){
+ if (trace_level >= 1 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_phs_ora_varchar2_table_fixup_after_execute(): Called for
'%s' : array_numstruct=%d, maxlen=%ld \n",
phs->name,
@@ -1716,7 +1716,7 @@
/* NULL */
if( item ){
SvSetMagicSV(item,&PL_sv_undef);
- if (trace_level >= 3 || dbd_verbose >= 3 ){
+ if (trace_level >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_phs_ora_varchar2_table_fixup_after_execute(): arr[%d] = undef;
SvSetMagicSV(item,&PL_sv_undef);\n",
i
@@ -1734,7 +1734,7 @@
}else{
if( (phs->array_indicators[i] == -2) ||
(phs->array_indicators[i] > 0) ){
/* Truncation occurred */
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_phs_ora_varchar2_table_fixup_after_execute(): Placeholder '%s': data
truncated at %d row.\n",
phs->name,i);
@@ -1765,7 +1765,7 @@
}
}
}
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_phs_ora_varchar2_table_fixup_after_execute():
scalar(@arr)=%ld.\n",
(long)av_len(arr)+1);
@@ -1800,7 +1800,7 @@
}
arr=(AV*)(SvRV(phs->sv));
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_number_table():
array_numstruct=%d\n",
phs->array_numstruct);
}
@@ -1812,7 +1812,7 @@
int numarrayentries=av_len( arr );
if( numarrayentries >= 0 ){
phs->array_numstruct = numarrayentries+1;
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_rebind_ph_number_table(): array_numstruct=%d (calculated) \n",
phs->array_numstruct);
}
@@ -1830,7 +1830,7 @@
default:
phs->maxlen=sizeof(double);
}
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_number_table():
phs->maxlen calculated =%ld\n",
(long)phs->maxlen);
}
@@ -1843,12 +1843,12 @@
/* Zero means "use current array length". */
phs->ora_maxarray_numentries=phs->array_numstruct;
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_number_table():
ora_maxarray_numentries assumed=phs->array_numstruct=%d\n",
phs->array_numstruct);
}
}else{
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_number_table():
ora_maxarray_numentries=%d\n",
phs->ora_maxarray_numentries);
}
@@ -1866,7 +1866,7 @@
croak("Unable to bind %s - %d structures by %d bytes requires too much
memory.",
phs->name, need_allocate_rows, buflen );
}else{
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_number_table():
ora_realloc_phs_array(,need_allocate_rows=%d,buflen=%d) succeeded.\n",
need_allocate_rows,buflen);
}
@@ -1951,7 +1951,7 @@
/* Defined NaN assumed =0 */
*(double*)(phs->array_buf+phs->maxlen*i)=0;
phs->array_indicators[i]=0;
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
STRLEN l;
char *p=SvPV(item,l);
@@ -2041,7 +2041,7 @@
croak("dbd_phs_ora_number_table_fixup_after_execute(): bad bind
variable. ARRAY reference required, but got %s for '%s'.",
neatsvpv(phs->sv,0), phs->name);
}
- if (trace_level >= 1 || dbd_verbose >= 1 ){
+ if (trace_level >= 1 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_phs_ora_number_table_fixup_after_execute(): Called for
'%s' : array_numstruct=%d, maxlen=%ld \n",
phs->name,
@@ -2105,7 +2105,7 @@
}else{
if( (phs->array_indicators[i] == -2) ||
(phs->array_indicators[i] > 0) ){
/* Truncation occurred */
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_phs_ora_number_table_fixup_after_execute(): Placeholder '%s': data
truncated at %d row.\n",
phs->name,i);
@@ -2178,7 +2178,7 @@
}
}
}
- if (trace_level >= 2 || dbd_verbose >= 2 ){
+ if (trace_level >= 2 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP,
"dbd_phs_ora_number_table_fixup_after_execute():
scalar(@arr)=%ld.\n",
(long)av_len(arr)+1);
@@ -2207,7 +2207,7 @@
}
- if (DBIS->debug >= 2 || dbd_verbose >=2 ) {
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 ) {
char *val = neatsvpv(phs->sv,10);
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_char() (1): bind %s <==
%.1000s (", phs->name, val);
if (!SvOK(phs->sv))
@@ -2278,7 +2278,7 @@
phs->alen = value_len + phs->alen_incnull;
- if (DBIS->debug >= 3 || dbd_verbose >=3) {
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 ) {
UV neatsvpvlen = (UV)DBIc_DBISTATE(imp_sth)->neatsvpvlen;
char *val = neatsvpv(phs->sv,10);
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_char() (2): bind %s <==
'%.*s' (size %ld/%ld, otype %d(%s), indp %d, at_exec %d)\n",
@@ -2306,7 +2306,7 @@
D_impdata(imp_sth_csr, imp_sth_t, sth_csr);
sword status;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " pp_rebind_ph_rset_in: BEGIN\n
calling OCIBindByName(stmhp=%p, bndhp=%p, errhp=%p, name=%s, csrstmhp=%p,
ftype=%d)\n", imp_sth->stmhp, phs->bndhp, imp_sth->errhp, phs->name,
imp_sth_csr->stmhp, phs->ftype);
OCIBindByName_log_stat(imp_sth->stmhp, &phs->bndhp, imp_sth->errhp,
@@ -2326,7 +2326,7 @@
return 0;
}
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " pp_rebind_ph_rset_in: END\n");
return 2;
@@ -2344,7 +2344,7 @@
int count;
sword status;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " pp_exec_rset bind %s - allocating new
sth...\n", phs->name);
/* extproc deallocates everything for us */
@@ -2401,7 +2401,7 @@
PUTBACK;
FREETMPS;
LEAVE;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " pp_exec_rset bind %s - allocated
%s...\n",
phs->name, neatsvpv(phs->sv, 0));
@@ -2411,7 +2411,7 @@
SV * sth_csr = phs->sv;
D_impdata(imp_sth_csr, imp_sth_t, sth_csr);
- if (DBIS->debug >= 3 || dbd_verbose >=3 )
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " bind %s - initialising new %s for
cursor 0x%lx...\n",
phs->name, neatsvpv(sth_csr,0), (unsigned long)phs->progv);
@@ -2455,7 +2455,7 @@
SV* ptr;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " in dbd_rebind_ph_xml\n");
/*go and create the XML dom from the passed in value*/
@@ -2500,7 +2500,7 @@
oci_error(sth, imp_sth->errhp, status, "OCIBindByName SQLT_NTY");
return 0;
}
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " pp_rebind_ph_nty: END\n");
@@ -2609,7 +2609,7 @@
csform = SQLCS_IMPLICIT;
else if (CSFORM_IMPLIES_UTF8(SQLCS_NCHAR))
csform = SQLCS_NCHAR; /* else leave csform == 0 */
- if (trace_level || dbd_verbose >= 1)
+ if (trace_level || dbd_verbose >= 3)
PerlIO_printf(DBILOGFP, "dbd_rebind_ph() (2): rebinding %s with
UTF8 value %s", phs->name,
(csform == SQLCS_IMPLICIT) ? "so setting csform=SQLCS_IMPLICIT"
:
(csform == SQLCS_NCHAR) ? "so setting csform=SQLCS_NCHAR" :
@@ -2717,7 +2717,7 @@
if (SvTYPE(newvalue) == SVt_PVLV && is_inout) /* may allow later */
croak("Can't bind ``lvalue'' mode scalar as inout parameter
(currently)");
- if (DBIS->debug >= 2 || dbd_verbose >=2) {
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 ) {
PerlIO_printf(DBILOGFP, "dbd_bind_ph(): bind %s <== %s (type
%ld (%s)",
name, neatsvpv(newvalue,0),
(long)sql_type,sql_typecode_name(sql_type));
if (is_inout)
@@ -2879,11 +2879,11 @@
}
else { /* shouldn't happen */
debug = 2;
- dbd_verbose =2;
+ dbd_verbose =3;
note = " [placeholder has no data buffer]";
}
- if (debug >= 2 || dbd_verbose >=2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " out %s = %s (arcode %d, ind %d,
len %d)%s\n",
phs->name, neatsvpv(sv,0), phs->arcode, phs->indp,
phs->alen, note);
}
@@ -2896,10 +2896,10 @@
}
else { /* shouldn't happen */
debug = 2;
- dbd_verbose =2;
+ dbd_verbose =3;
note = " [placeholder has no data buffer]";
}
- if (debug >= 2 || dbd_verbose >=2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" out %s = %s\t(TRUNCATED from %d to %ld,
arcode %d)%s\n",
phs->name, neatsvpv(sv,0), phs->indp,
(long)phs->alen, phs->arcode, note);
@@ -2907,7 +2907,7 @@
else {
if (phs->indp == -1) { /* is NULL */
(void)SvOK_off(phs->sv);
- if (debug >= 2 || dbd_verbose >=2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" out %s = undef
(NULL, arcode %d)\n",
phs->name, phs->arcode);
@@ -2925,7 +2925,7 @@
AV *av = (AV*)SvRV(phs->sv);
SV *sv = *av_fetch(av, index, 1);
dbd_phs_sv_complete(phs, sv, 0);
- if (debug >= 2 || dbd_verbose >=2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_phs_avsv_complete out '%s'[%ld] =
%s (arcode %d, ind %d, len %d)\n",
phs->name, (long)index, neatsvpv(sv,0), phs->arcode, phs->indp,
phs->alen);
}
@@ -2947,7 +2947,7 @@
int is_select = (imp_sth->stmt_type == OCI_STMT_SELECT);
- if (debug >= 2 || dbd_verbose >= 2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_st_execute %s (out%d, lob%d)...\n",
oci_stmt_type_name(imp_sth->stmt_type), outparams,
imp_sth->has_lobs);
@@ -2979,7 +2979,7 @@
}
else
if (SvTYPE(sv) == SVt_RV && SvTYPE(SvRV(sv)) == SVt_PVAV) {
- if (debug >= 2 || dbd_verbose >=2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" with %s = [] (len %ld/%ld, indp %d,
otype %d, ptype %d)\n",
phs->name,
@@ -3004,7 +3004,7 @@
/* so tell Oracle about it's current
length */
ub2 prev_alen = phs->alen;
phs->alen = (SvOK(sv)) ? SvCUR(sv) +
phs->alen_incnull : 0+phs->alen_incnull;
- if (debug >= 2 || dbd_verbose >=2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" with %s = '%.*s' (len
%ld(%ld)/%ld, indp %d, otype %d, ptype %d)\n",
phs->name,
(int)phs->alen,
@@ -3025,7 +3025,7 @@
}
- if (debug >= 2 || dbd_verbose >= 2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,"Statement Execute Mode is %d
(%s)\n",imp_sth->exe_mode,oci_exe_mode(imp_sth->exe_mode));
@@ -3051,7 +3051,7 @@
OCIAttrGet_stmhp_stat(imp_sth, &row_count, 0,
OCI_ATTR_ROW_COUNT, status);
}
- if (debug >= 2 || dbd_verbose >= 2) {
+ if (debug >= 2 || dbd_verbose >= 3 ) {
ub2 sqlfncode;
OCIAttrGet_stmhp_stat(imp_sth, &sqlfncode, 0,
OCI_ATTR_SQLFNCODE, status);
PerlIO_printf(DBILOGFP,
@@ -3078,7 +3078,7 @@
/* phs->alen has been updated by Oracle to hold the
length of the result */
phs_t *phs =
(phs_t*)(void*)SvPVX(AvARRAY(imp_sth->out_params_av)[i]);
SV *sv = phs->sv;
- if (debug >= 2 || dbd_verbose >= 2) {
+ if (debug >= 2 || dbd_verbose >= 3 ) {
PerlIO_printf(DBILOGFP,
"dbd_st_execute(): Analyzing inout
parameter '%s of type=%d'\n",
phs->name,phs->ftype);
@@ -3162,7 +3162,7 @@
csform = SQLCS_IMPLICIT;
else if (CSFORM_IMPLIES_UTF8(SQLCS_NCHAR))
csform = SQLCS_NCHAR; /* else leave csform == 0 */
- if (trace_level || dbd_verbose >= 1)
+ if (trace_level || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, "do_bind_array_exec() (2):
rebinding %s with UTF8 value %s", phs->name,
(csform == SQLCS_IMPLICIT) ? "so setting
csform=SQLCS_IMPLICIT" :
(csform == SQLCS_NCHAR) ? "so setting
csform=SQLCS_NCHAR" :
@@ -3286,7 +3286,7 @@
int *utf8_flgs;
tuples_utf8_av=newAV();
- if (debug >= 2 || dbd_verbose >=2)
+ if (debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " ora_st_execute_array %s count=%d (%s
%s %s)...\n",
oci_stmt_type_name(imp_sth->stmt_type), exe_count,
neatsvpv(tuples,0), neatsvpv(tuples_status,0),
@@ -3479,7 +3479,7 @@
OCIAttrGet_stmhp_stat(imp_sth, &num_errs, 0, OCI_ATTR_NUM_DML_ERRORS,
status);
- if (debug >= 6 || dbd_verbose >= 6)
+ if (debug >= 6 || dbd_verbose >= 6 )
PerlIO_printf(DBILOGFP, " ora_st_execute_array %d errors in
batch.\n",
num_errs);
@@ -3500,7 +3500,7 @@
(ub4)i, status);
OCIAttrGet_log_stat(row_errhp, OCI_HTYPE_ERROR, &row_off, 0,
OCI_ATTR_DML_ROW_OFFSET, imp_sth->errhp,
status);
- if (debug >= 6 || dbd_verbose >= 6)
+ if (debug >= 6 || dbd_verbose >= 6 )
PerlIO_printf(DBILOGFP, " ora_st_execute_array error in row
%d.\n",
row_off);
sv_setpv(err_svs[1], "");
@@ -3565,7 +3565,7 @@
}
ftype = ftype; /* no unused */
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" blob_read field %d+1, ftype %d, offset %ld, len %ld,
destoffset %ld, retlen %ld\n",
field, imp_sth->fbh[field].ftype, offset, len, destoffset,
(long)retl);
@@ -3604,7 +3604,7 @@
int i;
- if (DBIc_DBISTATE(imp_sth)->debug >= 6 || dbd_verbose >= 6)
+ if (DBIc_DBISTATE(imp_sth)->debug >= 6 || dbd_verbose >= 6 )
PerlIO_printf(DBIc_LOGPIO(imp_sth), " dbd_st_finish\n");
if (!DBIc_ACTIVE(imp_sth))
@@ -3697,7 +3697,7 @@
}
if (is_temporary) {
- if (DBIS->debug >= 3 || dbd_verbose >=3 ) {
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 ) {
PerlIO_printf(DBILOGFP, " OCILobFreeTemporary %s\n",
oci_status_name(status));
}
OCILobFreeTemporary_log_stat(imp_sth->svchp, imp_sth->errhp, lobloc,
status);
@@ -3737,7 +3737,7 @@
}
- if (DBIc_DBISTATE(imp_sth)->debug >= 6 || dbd_verbose >= 6 )
+ if (DBIc_DBISTATE(imp_sth)->debug >= 6 || dbd_verbose >= 6 )
PerlIO_printf(DBIc_LOGPIO(imp_sth), " dbd_st_destroy %s\n",
(dirty) ? "(OCIHandleFree skipped during global destruction)" :
(imp_sth->nested_cursor) ?"(OCIHandleFree skipped for nested cursor)"
: "");
Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Fri Dec 5 07:45:43 2008
@@ -607,7 +607,7 @@
OCIAttrGet_stmhp_stat(imp_sth, &imp_sth->stmt_type, 0, OCI_ATTR_STMT_TYPE,
status);
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_st_prepare'd sql %s (pl%d,
auto_lob%d, check_sql%d)\n",
oci_stmt_type_name(imp_sth->stmt_type),
oparse_lng, imp_sth->auto_lob, ora_check_sql);
@@ -695,7 +695,7 @@
*alenp = phs->alen;
*indpp = &phs->indp;
*piecep = OCI_ONE_PIECE;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " in '%s' [%lu,%lu]: len %2lu,
ind %d%s, value=%s\n",
phs->name, ul_t(iter), ul_t(index), ul_t(phs->alen),
phs->indp,
(phs->desc_h) ? " via descriptor" :
"",neatsvpv(phs->sv,10));
@@ -781,7 +781,7 @@
*alenpp = &phs->alen;
*indpp = &phs->indp;
*rcodepp= &phs->arcode;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " out '%s' [%ld,%ld]: alen %2ld,
piece %d%s\n",
phs->name, ul_t(iter), ul_t(index), ul_t(phs->alen),
*piecep,
(phs->desc_h) ? " via descriptor" : "");
@@ -820,7 +820,7 @@
*rcpp = fb_ary->arcode;
- if (dbd_verbose >= 5) {
+ if (dbd_verbose >= 5 ) {
PerlIO_printf(DBILOGFP, " In presist_lob_fetch_cbk\n");
}
@@ -914,7 +914,7 @@
return 0;
}
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " fetching field %d
of %d. LONG value truncated from %lu to %lu.\n",
fbh->field_num+1, DBIc_NUM_FIELDS(imp_sth),
ul_t(datalen), ul_t(bytelen));
@@ -967,7 +967,7 @@
if (fbh_nested->fetch_cleanup)
fbh_nested->fetch_cleanup(sth_nested, fbh_nested);
}
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" fetch_cleanup_rset - deactivating handle %s (defunct
nested cursor)\n",
neatsvpv(sth_nested, 0));
@@ -989,7 +989,7 @@
HV *init_attr = newHV();
int count;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" fetch_func_rset - allocating handle for cursor nested
within %s ...\n",
neatsvpv(sth, 0));
@@ -1009,7 +1009,7 @@
SvREFCNT_dec(init_attr);
PUTBACK; FREETMPS; LEAVE;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" fetch_func_rset - ... allocated %s for nested cursor\n",
neatsvpv(dest_sv, 0));
@@ -1045,7 +1045,7 @@
{
dTHX;
- if (DBIS->debug >= 6 || dbd_verbose >=6)
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 )
PerlIO_printf(DBILOGFP, " dbd_rebind_ph_rset
phs->is_inout=%d\n",phs->is_inout);
/* Only do this part for inout cursor refs because pp_exec_rset only gets
called for all the output params */
@@ -1170,7 +1170,7 @@
phs->csform = csform;
}
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " calling OCILobWrite
phs->csid=%d phs->csform=%d amtp=%d\n",
phs->csid, phs->csform, amtp );
@@ -1252,7 +1252,7 @@
0, 0, (ub2)0 ,csform ,status );
/* lab 0, 0, (ub2)0, (ub1)SQLCS_IMPLICIT, status); */
- if (dbis->debug >= 3 || dbd_verbose >=3)
+ if (dbis->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " OCILobRead field %d %s: LOBlen
%lu, LongReadLen %lu, BufLen %lu, Got %lu\n",
fbh->field_num+1, oci_status_name(status), ul_t(loblen),
ul_t(imp_sth->long_readlen), ul_t(buflen), ul_t(amtp));
@@ -1272,7 +1272,7 @@
else {
assert(amtp == 0);
SvGROW(dest_sv, byte_destoffset + 1);
- if (dbis->debug >= 3 || dbd_verbose >=3)
+ if (dbis->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" OCILobRead field %d %s: LOBlen %lu, LongReadLen %lu,
BufLen %lu, Got %lu\n",
fbh->field_num+1, "SKIPPED", (unsigned long)loblen,
@@ -1280,7 +1280,7 @@
(unsigned long)amtp);
}
- if (dbis->debug >= 3 || dbd_verbose >=3)
+ if (dbis->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " blob_read field %d, ftype %d, offset %ld,
len %ld, destoffset %ld, retlen %lu\n",
fbh->field_num+1, ftype, offset, len, destoffset, ul_t(amtp));
@@ -1371,7 +1371,7 @@
buflen = amtp;
}
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" blob_read field %d: ftype %d %s, offset %ld, len %lu."
"LOB csform %d, len %lu, amtp %lu, (destoffset=%ld)\n",
@@ -1386,7 +1386,7 @@
&amtp, (ub4)1 + offset, bufp, buflen,
0, 0, (ub2)0 , csform, status);
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" OCILobRead field %d %s: LOBlen %lu, LongReadLen %lu,
BufLen %lu, amtp %lu\n",
fbh->field_num+1, oci_status_name(status), ul_t(loblen),
@@ -1401,7 +1401,7 @@
}
else {
assert(amtp == 0);
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" OCILobRead field %d %s: LOBlen %lu, LongReadLen %lu,
BufLen %lu, Got %lu\n",
fbh->field_num+1, "SKIPPED", ul_t(loblen),
@@ -1514,7 +1514,7 @@
OCILobRead_log_stat(imp_sth->svchp, imp_sth->errhp, lobloc,
&amtp, (ub4)1, SvPVX(dest_sv), buflen,
0, 0, (ub2)0, csform, status);
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" OCILobRead %s %s: csform %d, LOBlen %luc, LongReadLen
%luc, BufLen %lub, Got %luc\n",
name, oci_status_name(status), csform, ul_t(loblen),
@@ -1542,7 +1542,7 @@
/* tell perl what we've put in its dest_sv */
SvCUR(dest_sv) = amtp;
*SvEND(dest_sv) = '\0';
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" OCILobRead %s %s: LOBlen %lu, LongReadLen %lu, BufLen
%lu, Got %lu\n",
name, "SKIPPED", ul_t(loblen),
@@ -1579,7 +1579,7 @@
fbh_setup_getrefpv(imp_fbh_t *fbh, int desc_t, char *bless)
{
dTHX;
- if (DBIS->debug >= 2 || dbd_verbose >=2)
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" col %d: otype %d, desctype %d, %s", fbh->field_num,
fbh->dbtype, desc_t, bless);
fbh->ftype = fbh->dbtype;
@@ -1643,7 +1643,7 @@
SV *raw_sv;
/* get the data based on the type code*/
- if (DBIS->debug >= 5 || dbd_verbose >=5) {
+ if (DBIS->debug >= 5 || dbd_verbose >= 5 ) {
PerlIO_printf(DBILOGFP, " getting value of object attribute named %s
with typecode=%s\n",name,oci_typecode_name(typecode));
}
@@ -1790,7 +1790,7 @@
fbh_obj_t *fld;
OCIInd *obj_ind;
- if (DBIS->debug >= 5 || dbd_verbose >=5) {
+ if (DBIS->debug >= 5 || dbd_verbose >= 5 ) {
PerlIO_printf(DBILOGFP, " getting attributes of object named
%s with typecode=%s\n",obj->type_name,oci_typecode_name(obj->typecode));
}
@@ -1940,7 +1940,7 @@
fetch_func_oci_object(SV *sth, imp_fbh_t *fbh,SV *dest_sv)
{
dTHX;
- if (DBIS->debug >= 4 || dbd_verbose >=4) {
+ if (DBIS->debug >= 4 || dbd_verbose >= 4 ) {
PerlIO_printf(DBILOGFP, " getting an embedded object named %s
with typecode=%s\n",fbh->obj->type_name,oci_typecode_name(fbh->obj->typecode));
}
@@ -1973,13 +1973,13 @@
ub4 actual_bufl=imp_sth->piece_size*(fb_ary->piece_count)+fb_ary->bufl;
if (fb_ary->piece_count==0){
- if (DBIS->debug >= 6 || dbd_verbose >= 6)
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 )
PerlIO_printf(DBILOGFP," Fetch persistent lob of %d
(char/bytes) with callback in 1 piece of %d
(Char/Bytes)\n",actual_bufl,fb_ary->bufl);
memcpy(fb_ary->cb_abuf,fb_ary->abuf,fb_ary->bufl );
} else {
- if (DBIS->debug >= 6 || dbd_verbose >= 6)
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 )
PerlIO_printf(DBILOGFP," Fetch persistent lob of %d
(Char/Bytes) with callback in %d piece(s) of %d (Char/Bytes) and one piece of
%d
(Char/Bytes)\n",actual_bufl,fb_ary->piece_count,fbh->piece_size,fb_ary->bufl);
memcpy(fb_ary->cb_abuf+imp_sth->piece_size*(fb_ary->piece_count),fb_ary->abuf,fb_ary->bufl
);
@@ -2016,7 +2016,7 @@
- if (DBIS->debug >= 4 || dbd_verbose >= 4) {
+ if (DBIS->debug >= 4 || dbd_verbose >= 4 ) {
PerlIO_printf(DBILOGFP, "in fetch_get_piece \n");
}
@@ -2072,7 +2072,7 @@
}
- if (DBIS->debug >= 6 || dbd_verbose >= 6){
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 ){
if (fb_ary->piece_count==1){
PerlIO_printf(DBILOGFP," Fetch persistent lob of %d
(Char/Bytes) with Polling in 1 piece\n",actual_bufl);
@@ -2156,7 +2156,7 @@
fb_ary->cb_bufl=fbh->disize; /*reset this back to the max size for the
fetch*/
memset( fb_ary->cb_abuf, '\0', fbh->disize ); /*clean out the call back
buffer*/
- if (DBIS->debug >= 5 || dbd_verbose >=5)
+ if (DBIS->debug >= 5 || dbd_verbose >= 5 )
PerlIO_printf(DBILOGFP," fetch_cleanup_pres_lobs \n");
return;
@@ -2174,7 +2174,7 @@
}
}
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP," fetch_cleanup_oci_object \n");
return;
}
@@ -2189,7 +2189,7 @@
imp_sth->rs_array_num_rows=0;
imp_sth->rs_array_idx=0;
imp_sth->rs_array_status=OCI_SUCCESS;
- if (DBIS->debug >= 3 || dbd_verbose >=3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " rs_array_init: rs_array_on=%d,
rs_array_size=%d\n",imp_sth->rs_array_on,imp_sth->rs_array_size);
}
@@ -2273,7 +2273,7 @@
if (imp_sth->rs_array_on && cache_rows>0)
imp_sth->rs_array_size=cache_rows>128?128:cache_rows; /*
restrict to 128 for now */
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" row cache OCI_ATTR_PREFETCH_ROWS %lu, OCI_ATTR_PREFETCH_MEMORY
%lu\n",
(unsigned long) (cache_rows), (unsigned long) (cache_mem));
@@ -2291,7 +2291,7 @@
dTHX;
sword status;
- if (DBIS->debug >= 5 || dbd_verbose >= 5) {
+ if (DBIS->debug >= 5 || dbd_verbose >= 5 ) {
PerlIO_printf(DBILOGFP, "At level=%d in description an embedded
object \n",level);
}
/*Describe the field (OCIParm) we know it is a object or a collection */
@@ -2305,7 +2305,7 @@
return 0;
}
- if (DBIS->debug >= 6 || dbd_verbose >= 6) {
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 ) {
PerlIO_printf(DBILOGFP, "Geting the properties of object named
=%s at level %d\n",obj->type_name,level);
}
OCITypeByName_log_stat(imp_sth->envhp,imp_sth->errhp,imp_sth->svchp,obj->type_name,obj->type_namel,&obj->tdo,status);
@@ -2341,7 +2341,7 @@
OCIParam *list_attr= (OCIParam *) 0;
ub2 pos;
- if (DBIS->debug >= 6 || dbd_verbose >= 6) {
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 ) {
PerlIO_printf(DBILOGFP, "Object named =%s at level %d
is an Object\n",obj->type_name,level);
}
@@ -2407,7 +2407,7 @@
return 0;
}
- if (DBIS->debug >= 6 || dbd_verbose >= 6) {
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 ) {
PerlIO_printf(DBILOGFP, "Getting property #%d,
named=%s and its typecode is %d \n",pos,fld->type_name,fld->typecode);
}
@@ -2421,7 +2421,7 @@
} else {
/*well this is an embedded table or varray of some form so find
out what is in it*/
- if (DBIS->debug >= 6 || dbd_verbose >= 6) {
+ if (DBIS->debug >= 6 || dbd_verbose >= 6 ) {
PerlIO_printf(DBILOGFP, "Object named =%s at level %d
is an Varray or Table\n",obj->type_name,level);
}
@@ -2526,14 +2526,14 @@
imp_sth->long_readlen = long_readlen;
if (imp_sth->stmt_type != OCI_STMT_SELECT) { /* XXX DISABLED, see
num_fields test below */
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_describe skipped for
%s\n",
oci_stmt_type_name(imp_sth->stmt_type));
/* imp_sth memory was cleared when created so no setup required here
*/
return 1;
}
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_describe %s (%s, lb %lu)...\n",
oci_stmt_type_name(imp_sth->stmt_type),
DBIc_ACTIVE(imp_sth) ? "implicit" : "EXPLICIT", (unsigned
long)long_readlen);
@@ -2558,7 +2558,7 @@
return 0;
}
if (num_fields == 0) {
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_describe skipped for %s (no fields
returned)\n",
oci_stmt_type_name(imp_sth->stmt_type));
/* imp_sth memory was cleared when created so no setup required here
*/
@@ -2620,7 +2620,7 @@
fbh->ftype = 5; /* default: return as null terminated
string */
- if (DBIS->debug >= 4 || dbd_verbose >= 4)
+ if (DBIS->debug >= 4 || dbd_verbose >= 4 )
PerlIO_printf(DBILOGFP, "Describe col #%d
type=%d(%s)\n",i,fbh->dbtype,sql_typecode_name(fbh->dbtype));
@@ -2855,14 +2855,14 @@
fbh->ftype = fbh->dbtype;
fbh->disize = fbh->dbsize;
p = "Field %d has an Oracle type (%d) which is
not explicitly supported%s";
- if (DBIS->debug >= 1 || dbd_verbose >= 1)
+ if (DBIS->debug >= 1 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, p, i, fbh->dbtype,
"\n");
if (dowarn)
warn(p, i, fbh->dbtype, "");
break;
}
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
"Described col %2d: dbtype %d(%s), scale %d, prec %d,
nullok %d, name %s\n"
" : dbsize %d, char_used %d, char_size %d, csid
%d, csform %d, disize %d\n",
@@ -2881,7 +2881,7 @@
est_width += avg_width;
- if (DBIS->debug >= 2 || dbd_verbose >= 2)
+ if (DBIS->debug >= 2 || dbd_verbose >= 3 )
dbd_fbh_dump(fbh, (int)i, 0);
}/* end define of filed struct[i] fbh*/
@@ -2945,7 +2945,7 @@
if (fbh->ftype == 108) { /* Embedded object bind it
differently*/
- if (DBIS->debug >= 5 || dbd_verbose >= 5){
+ if (DBIS->debug >= 5 || dbd_verbose >= 5 ){
PerlIO_printf(DBILOGFP,"Field #%d is a object
or colection of some sort. Using OCIDefineObject and or OCIObjectPin \n",i);
}
@@ -2957,7 +2957,7 @@
++num_errors;
}
- if (DBIS->debug >= 5 || dbd_verbose >= 5){
+ if (DBIS->debug >= 5 || dbd_verbose >= 5 ){
dump_struct(imp_sth,fbh->obj,0);
}
@@ -2979,7 +2979,7 @@
#ifdef OCI_ATTR_CHARSET_FORM
if ( (fbh->dbtype == 1) && fbh->csform ) {
/* csform may be 0 when talking to Oracle 8.0 database*/
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " calling OCIAttrSet
OCI_ATTR_CHARSET_FORM with csform=%d\n", fbh->csform );
OCIAttrSet_log_stat( fbh->defnp, (ub4)
OCI_HTYPE_DEFINE, (dvoid *) &fbh->csform,
(ub4) 0, (ub4) OCI_ATTR_CHARSET_FORM,
imp_sth->errhp, status );
@@ -2992,7 +2992,7 @@
}
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" dbd_describe'd %d columns (row bytes: %d max, %d
est avg, cache: %d)\n",
(int)num_fields, imp_sth->t_dbsize, imp_sth->est_width,
imp_sth->cache_rows);
@@ -3033,7 +3033,7 @@
status = OCI_SUCCESS;
} else {
- if (DBIS->debug >= 3 || dbd_verbose >= 3){
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 ){
PerlIO_printf(DBILOGFP, " dbd_st_fetch %d fields...\n",
DBIc_NUM_FIELDS(imp_sth));
}
@@ -3042,7 +3042,7 @@
if (imp_sth->exe_mode!=OCI_STMT_SCROLLABLE_READONLY)
croak ("attempt to use a scrollable cursor
without first setting ora_exe_mode to OCI_STMT_SCROLLABLE_READONLY\n") ;
- if (DBIS->debug >= 4 || dbd_verbose >= 4)
+ if (DBIS->debug >= 4 || dbd_verbose >= 4 )
PerlIO_printf(DBILOGFP," Scrolling Fetch,
postion before fetch=%d, Orientation = %s , Fetchoffset =%d\n",
imp_sth->fetch_position,oci_fetch_options(imp_sth->fetch_orient),imp_sth->fetch_offset);
@@ -3052,7 +3052,7 @@
/* defualt and OCI_FETCH_NEXT are the same so
this avoids miscaluation on the next value*/
OCIAttrGet_stmhp_stat(imp_sth,
&imp_sth->fetch_position, 0, OCI_ATTR_CURRENT_POSITION, status);
- if (DBIS->debug >= 4 || dbd_verbose >= 4)
+ if (DBIS->debug >= 4 || dbd_verbose >= 4 )
PerlIO_printf(DBILOGFP," Scrolling Fetch,
postion after fetch=%d\n",imp_sth->fetch_position);
} else {
@@ -3087,7 +3087,7 @@
if (status == OCI_NO_DATA) {
dTHR; /* for DBIc_ACTIVE_off */
DBIc_ACTIVE_off(imp_sth); /* eg finish */
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " dbd_st_fetch
no-more-data\n");
return Nullav;
}
@@ -3108,7 +3108,7 @@
av = DBIS->get_fbav(imp_sth);
- if (DBIS->debug >= 3 || dbd_verbose >= 3) {
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 ) {
PerlIO_printf(DBILOGFP, " dbd_st_fetched %d fields with
status of %d(%s)\n", num_fields,status, oci_status_name(status));
}
@@ -3125,7 +3125,7 @@
SV *sv = AvARRAY(av)[i]; /* Note: we (re)use the SV in the AV
*/;
- if (DBIS->debug >= 4 || dbd_verbose >= 4) {
+ if (DBIS->debug >= 4 || dbd_verbose >= 4 ) {
PerlIO_printf(DBILOGFP, " field #%d with
rc=%d(%s)\n",i+1,rc,oci_col_return_codes(rc));
}
@@ -3206,7 +3206,7 @@
oci_error(sth, imp_sth->errhp, OCI_ERROR, buf);
}
- if (DBIS->debug >= 5 || dbd_verbose >= 5){
+ if (DBIS->debug >= 5 || dbd_verbose >= 5 ){
PerlIO_printf(DBILOGFP, "\n %p (field=%d): %s\n",
av, i,neatsvpv(sv,10));
}
}
@@ -3427,7 +3427,7 @@
tablename=new_tablename;
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " lob refetch using a
synonym named=%s for %s \n", syn_name,tablename);
@@ -3461,7 +3461,7 @@
return oci_error(sth, errhp, status,
"OCIDescribeAny/OCIAttrGet/LOB refetch");
}
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " lob refetch from table %s, %d
columns:\n", tablename, numcols);
for (i = 1; i <= (long)numcols; i++) {
@@ -3480,7 +3480,7 @@
OCI_ATTR_NAME, errhp, status);
if (status)
break;
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " lob refetch table col %d:
'%.*s' otype %d\n",
(int)i, (int)col_name_len,col_name, col_dbtype);
if (col_dbtype != SQLT_CLOB && col_dbtype != SQLT_BLOB)
@@ -3548,7 +3548,7 @@
while( (sv_other =
hv_iternextsv(lob_cols_hv, &p_other, &i)) != NULL ) {
if (phs->ftype !=
SvIV(sv_other))
continue;
- if (DBIS->debug >= 3 ||
dbd_verbose >= 3)
+ if (DBIS->debug >= 3 ||
dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
"
both %s and %s have type %d - ambiguous\n",
neatsvpv(sv,0), neatsvpv(sv_other,0), (int)SvIV(sv_other));
@@ -3562,7 +3562,7 @@
sprintf(sql_field, "%s%s \"%s\"",
(SvCUR(sql_select)>7)?", ":"", p,
&phs->name[1]);
sv_catpv(sql_select, sql_field);
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" lob refetch %s param:
otype %d, matched field '%s' %s(%s)\n",
phs->name, phs->ftype, p,
@@ -3579,7 +3579,7 @@
}
if (!matched) {
++unmatched_params;
- if (DBIS->debug >= 3 || dbd_verbose >=
3)
+ if (DBIS->debug >= 3 || dbd_verbose >=
3 )
PerlIO_printf(DBILOGFP,
" lob refetch %s
param: otype %d, UNMATCHED\n",
phs->name, phs->ftype);
@@ -3595,7 +3595,7 @@
sv_catpv(sql_select, " from ");
sv_catpv(sql_select, tablename);
sv_catpv(sql_select, " where rowid = :rid for update"); /* get
row with lock */
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" lob refetch sql: %s\n",
SvPVX(sql_select));
lr->stmthp = NULL;
@@ -3635,7 +3635,7 @@
fbh->name,i+1);
phs = (phs_t*)(void*)SvPVX(*phs_svp);
fbh->special = phs;
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP,
" lob refetch %d for '%s'
param: ftype %d setup\n",
(int)i+1,fbh->name, fbh->dbtype);
@@ -3748,7 +3748,7 @@
fbh->csform = csform;
}
- if (DBIS->debug >= 3 || dbd_verbose >= 3)
+ if (DBIS->debug >= 3 || dbd_verbose >= 3 )
PerlIO_printf(DBILOGFP, " calling OCILobWrite
fbh->csid=%d fbh->csform=%d amtp=%d\n",
fbh->csid, fbh->csform, amtp );
Modified: dbd-oracle/trunk/typemap
==============================================================================
--- dbd-oracle/trunk/typemap (original)
+++ dbd-oracle/trunk/typemap Fri Dec 5 07:45:43 2008
@@ -1 +1,2 @@
-OCILobLocator * T_PTROBJ
+OCILobLocator * T_PTROBJ
+OCIXMLType * T_PTROBJ
\ No newline at end of file
