| timbo@cvs.perl.org 2005-06-03, 8:27 pm |
| Author: timbo
Date: Thu Nov 25 05:01:40 2004
New Revision: 591
Modified:
dbd-oracle/trunk/Changes
dbd-oracle/trunk/Makefile.PL
dbd-oracle/trunk/oci8.c
Log:
Fixed csform setting for Oracle 8.0 (don't set if it's 0)
Changed Makfile.PL to prefer ~/rdbms/public over other ~/rdbms/* for .h files.
Modified: dbd-oracle/trunk/Changes
====================
====================
====================
==================
--- dbd-oracle/trunk/Changes (original)
+++ dbd-oracle/trunk/Changes Thu Nov 25 05:01:40 2004
@@ -1,7 +1,12 @@
=head1 Changes in DBD-Oracle 1.17 (svn rev NNN)
+ Fixed csform setting for Oracle 8.0.
+
+ Changed Makfile.PL to prefer ~/rdbms/public over other ~/rdbms/* for .h files.
Changed README.vms re logical name tables thanks to Jakob Snoer.
+ Added VMS logical name checks to Makefile.PL thanks to Jakob Snoer.
+
=head1 Changes in DBD-Oracle 1.16 (svn rev 515) 22nd October 2004
NOTE:
Modified: dbd-oracle/trunk/Makefile.PL
====================
====================
====================
==================
--- dbd-oracle/trunk/Makefile.PL (original)
+++ dbd-oracle/trunk/Makefile.PL Thu Nov 25 05:01:40 2004
@@ -176,9 +176,9 @@
if ($os eq 'VMS') {
my $OCIINCLUDE = join " ", vmsify("$OH/rdbms/"),
+ vmsify("$OH/rdbms/public"),
vmsify("$OH/rdbms/demo/"),
vmsify("$OH/rdbms/demo/oci_demo/"),
- vmsify("$OH/rdbms/public"),
vmsify("$OH/netconfig/demo/"); # eg nzt.h in 8.1.7 on VMS
$opts{INC} = "$OCIINCLUDE $dbi_arch_dir";
$opts{OBJECT} = 'oracle.obj dbdimp.obj oci7.obj oci8.obj' if $] < 5.005;
@@ -563,7 +563,7 @@
$OCIINCLUDE .= " -I$OH/rdbms/demo";
my @h_dirs = find_headers();
my $inc = join " ", map { "-I$OH/$_" } @h_dirs;
- $opts{INC} = "$OCIINCLUDE $inc -I$dbi_arch_dir";
+ $opts{INC} = "$inc $OCIINCLUDE -I$dbi_arch_dir";
}
@@ -1300,9 +1300,10 @@
my $dir = $File::Find::dir;
$dir =~ s:^\Q$OH/::;
$h_dir{$dir} = $_;
- $h_file{$_} = $dir;
+ $h_file{$_} ||= $dir; # record first one found
print "Found $dir/$_\n" if $::opt_d;
- }, "$OH/rdbms",
+ }, "$OH/rdbms/public", # prefer public over others
+ "$OH/rdbms",
"$OH/plsql", # oratypes.h sometimes here (eg HPUX 11.23 Itanium Oracle 9.2.0)
);
@h_dir = keys %h_dir;
Modified: dbd-oracle/trunk/oci8.c
====================
====================
====================
==================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Thu Nov 25 05:01:40 2004
@@ -1313,15 +1313,11 @@
}
#ifdef OCI_ATTR_CHARSET_FOR
M
- if ( (fbh->dbtype == 1) ) { /* && (fbh->csform == SQLCS_NCHAR) && CS_IS_UTF8(ncharseti
d) ) { */
- /* ok... after doing what tim asked: setting SvUTF8 strictly based on csid 8bit Nchar test was broken
- and this currently effectively just sets Attrs to the values in fhb ignoring ncharsetid altogether
- probably wrong
- */
- ub1 csform = fbh->csform;
+ if ( (fbh->dbtype == 1) && fbh->csform ) {
+ /* csform may be 0 when talking to Oracle 8.0 database */
if (DBIS->debug >= 3)
- PerlIO_printf(DBILOG
FP, " calling OCIAttrSet OCI_ATTR_CHARSET_FOR
M with csform=%d\n", csform );
- OCIAttrSet_log_stat(
fbh->defnp, (ub4) OCI_HTYPE_DEFINE, (dvoid *) &csform,
+ PerlIO_printf(DBILOG
FP, " calling OCIAttrSet OCI_ATTR_CHARSET_FOR
M with csform=%d\n", fbh->csform );
+ OCIAttrSet_log_stat(
fbh->defnp, (ub4) OCI_HTYPE_DEFINE, (dvoid *) &fbh->csform,
(ub4) 0, (ub4) OCI_ATTR_CHARSET_FOR
M, imp_sth->errhp, status );
if (status != OCI_SUCCESS) {
oci_error(h, imp_sth->errhp, status, "OCIAttrSet OCI_ATTR_CHARSET_FOR
M");
|