| timbo@cvs.perl.org 2005-06-03, 8:27 pm |
| Author: timbo
Date: Thu Oct 21 09:52:28 2004
New Revision: 509
Modified:
dbd-oracle/trunk/Changes
dbd-oracle/trunk/oci8.c
dbd-oracle/trunk/t/23wide_db_8bit.t
dbd-oracle/trunk/t/25plsql.t
Log:
Assorted minor tweaks. About ready for realease, I hope...
Modified: dbd-oracle/trunk/Changes
====================
====================
====================
==================
--- dbd-oracle/trunk/Changes (original)
+++ dbd-oracle/trunk/Changes Thu Oct 21 09:52:28 2004
@@ -1,4 +1,4 @@
-=head1 Changes in DBD-Oracle 1.16 (svn rev 505) 19th October 2004
+=head1 Changes in DBD-Oracle 1.16 (svn rev 509) 21st October 2004
NOTE:
This release has major changes to Unicode support. See below.
Modified: dbd-oracle/trunk/oci8.c
====================
====================
====================
==================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Thu Oct 21 09:52:28 2004
@@ -752,14 +752,14 @@
OCILobLocator *lobl = (OCILobLocator*)fbh->desc_h;
sword ftype = fbh->ftype;
sword status;
- char *typename;
+ char *type_name;
if (ftype == 112)
- typename = "CLOB";
+ type_name = "CLOB";
else if (ftype == 113)
- typename = "BLOB";
+ type_name = "BLOB";
else if (ftype == 114)
- typename = "BFILE";
+ type_name = "BFILE";
else {
oci_error(sth, imp_sth->errhp, OCI_ERROR,
"blob_read not currently supported for non-LOB types with OCI 8 "
@@ -783,7 +783,7 @@
return 0;
}
if (ftype == 112 && csform == SQLCS_NCHAR)
- typename = "NCLOB";
+ type_name = "NCLOB";
/*
* We assume our caller has already done the
@@ -821,7 +821,7 @@
PerlIO_printf(DBILOG
FP,
" blob_read field %d: ftype %d %s, offset %ld, len %lu."
"LOB csform %d, len %lu, amtp %lu, (destoffset=%ld)\n",
- fbh->field_num+1, ftype, typename, offset, ul_t(len),
+ fbh->field_num+1, ftype, type_name, offset, ul_t(len),
csform, loblen, ul_t(amtp), destoffset);
if (loblen > 0) {
Modified: dbd-oracle/trunk/t/23wide_db_8bit.t
====================
====================
====================
==================
--- dbd-oracle/trunk/t/23wide_db_8bit.t (original)
+++ dbd-oracle/trunk/t/23wide_db_8bit.t Thu Oct 21 09:52:28 2004
@@ -42,9 +42,10 @@
}
END {
+ local($?, $!);
eval {
- local $dbh->{PrintError} = 0;
- drop_table($dbh) if $dbh and not $ENV& #123;'DBD_SKIP_TABLE
_DROP'};
+ local $dbh->{PrintError} = 0 if $dbh;
+ drop_table($dbh) if $dbh and not $ENV& #123;'DBD_SKIP_TABLE
_DROP'};
};
}
Modified: dbd-oracle/trunk/t/25plsql.t
====================
====================
====================
==================
--- dbd-oracle/trunk/t/25plsql.t (original)
+++ dbd-oracle/trunk/t/25plsql.t Thu Oct 21 09:52:28 2004
@@ -314,8 +314,12 @@
end if;
END;
}) or skip("Can't create a function ($DBI::errstr)", 16);
- my $sth = $dbh->prepare(qq{SELECT $func_name(?, ?) FROM DUAL});
- ok(0, $sth);
+ my $sth = $dbh->prepare(qq{SELECT $func_name(?, ?) FROM DUAL}, {
+ # Oracle 8 describe fails with ORA-06553: PLS-561: charset mismatch
+ ora_check_sql => 0,
+ });
+ ok(0, $sth, "Can't prepare select from function ($DBI::errstr)");
+ skip("Can't select from function ($DBI::errstr)", 15) unless $sth;
ok(0, $sth->bind_columns(\my $returnVal));
for (1..2) {
ok(0, $sth->bind_param(1, "foo", { ora_csform => SQLCS_NCHAR }));
|