[svn:dbd-oracle] r14762 - in dbd-oracle/trunk: . t

Author: byterock
Date: Sun Mar 20 09:53:13 2011
New Revision: 14762

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/dbdimp.h
   dbd-oracle/trunk/oci8.c
   dbd-oracle/trunk/t/58object.t

Log:
Cleaning up a few more loose ends

Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Sun Mar 20 09:53:13 2011
@@ -1,7 +1,10 @@
 =head1 Changes in DBD-Oracle 1.28 (svn rev xxxxx)
 
-  Added connection attribute 'ora_connect_with_default_signals' that will localize Perl's $SIG{INT} handeler from Brian Phillips and T. Bunce
-  Fix in execute_array to stop possible endless loop when using a fetch sub by by Martin J. Evans 
+  Changed out note for diag in 26exe_array.t so it is compatiable with older version of test by John Scoles
+  A fix from Charles Jardine for 58object.t to stop an error on some 64 bit systems
+  A few quick changes from H. Merijn Brand to fix some compiler warings and a fix for Oracle 9 clients
+  Added connection attribute 'ora_connect_with_default_signals' that will localize Perl's $SIG{INT} handler from Brian Phillips and T. Bunce
+  Fix in execute_array to stop possible endless loop when using a fetch sub by Martin J. Evans 
   Adapted Martin J. Evans' ODBC 70execute_array.t into t/26exe_array.t by John Scoles
   Fix for execute_array to bring it up to spec. by Martin J. Evans and John Scoles
   Marked ProC, Oraperl.pm, ora_explain.pl, ora_context, ora_use_proc_connection and ora_parse_lang as deprecated  to be removed in 1.29

Modified: dbd-oracle/trunk/dbdimp.h
==============================================================================
--- dbd-oracle/trunk/dbdimp.h	(original)
+++ dbd-oracle/trunk/dbdimp.h	Sun Mar 20 09:53:13 2011
@@ -316,6 +316,7 @@
 void ora_free_fbh_contents _((imp_fbh_t *fbh));
 void ora_free_templob _((SV *sth, imp_sth_t *imp_sth, OCILobLocator *lobloc));
 int ora_dbtype_is_long _((int dbtype));
+int oratype_rebind_ok _((int dbtype));
 fb_ary_t *fb_ary_alloc _((ub4 bufl, int size));
 fb_ary_t *fb_ary_cb_alloc _((ub4 piece_size,ub4 max_len, int size));
 

Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c	(original)
+++ dbd-oracle/trunk/oci8.c	Sun Mar 20 09:53:13 2011
@@ -474,6 +474,7 @@
 	dTHX;
 	SV *sv;
 	switch (attr) {
+#ifdef ORA_OCI_102
 	case OCI_ATTR_MODULE:                    return "OCI_ATTR_MODULE";        /* module for tracing */
 	case OCI_ATTR_ACTION:                    return "OCI_ATTR_ACTION";        /* action for tracing */
 	case OCI_ATTR_CLIENT_INFO:               return "OCI_ATTR_CLIENT_INFO";               /* client info */
@@ -492,6 +493,7 @@
 	case OCI_ATTR_SESSION_STATE_CLEARED:     return "OCI_ATTR_SESSION_STATE_CLEARED";     /* session state cleared*/
 	case OCI_ATTR_SESSION_MIGRATED:          return "OCI_ATTR_SESSION_MIGRATED";       /* did session migrate*/
 	case OCI_ATTR_SESSION_PRESERVE_STATE:    return "OCI_ATTR_SESSION_PRESERVE_STATE";    /* preserve session state */
+#endif
 #ifdef ORA_OCI_112
 	case OCI_ATTR_DRIVER_NAME:               return "OCI_ATTR_DRIVER_NAME";               /* Driver Name */
 #endif
@@ -1731,7 +1733,7 @@
 	}
 
 	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",
+		PerlIO_printf(DBILOGFP, "	blob_read field %d, ftype %d, offset %ld, len %lu, destoffset %ld, retlen %lu\n",
 			fbh->field_num+1, ftype, offset, len, destoffset, ul_t(amtp));
 
 	SvCUR_set(dest_sv, byte_destoffset+amtp);
@@ -3889,7 +3891,7 @@
 						aTHX_ sv, fbh->req_type, fbh->bind_flags, NULL);
 						if (sts == 0) {
 							sprintf(errstr,
-								"over/under flow converting column %d to type %ld",
+								"over/under flow converting column %d to type %d",
 								i+1, fbh->req_type);
 							oci_error(sth, imp_sth->errhp, OCI_ERROR, errstr);
 							return Nullav;
@@ -3897,7 +3899,7 @@
 						}
 						else if (sts == -2) {
 							sprintf(errstr,
-								"unsupported bind type %ld for column %d",
+								"unsupported bind type %d for column %d",
 								fbh->req_type, i+1);
 							return Nullav;
 						}
@@ -4621,4 +4623,4 @@
 	}
 	imp_dbh->server_version = vernum;
 	return vernum;
-}
\ No newline at end of file
+}

Modified: dbd-oracle/trunk/t/58object.t
==============================================================================
--- dbd-oracle/trunk/t/58object.t	(original)
+++ dbd-oracle/trunk/t/58object.t	Sun Mar 20 09:53:13 2011
@@ -82,9 +82,9 @@
             or die $dbh->errstr;
 $dbh->do(qq{ INSERT INTO $table VALUES (2, $sub_type(NULL, 'obj2', 
                     TO_DATE('2004-11-30 14:27:18', 'YYYY-MM-DD HH24:MI:SS'),
-                    12345.6789)) }
+                    '12345.6789')) }
             ) or die $dbh->errstr;
-$dbh->do(qq{ INSERT INTO $table VALUES (3, $sub_type(5, 'obj3', NULL, 777.666)) }
+$dbh->do(qq{ INSERT INTO $table VALUES (3, $sub_type(5, 'obj3', NULL, '777.666')) }
             ) or die $dbh->errstr;
 
 $dbh->do(qq{ CREATE OR REPLACE TYPE $inner_type AS OBJECT (