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

Author: yanick
Date: Tue Mar 13 08:01:03 2012
New Revision: 15215

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/t/rt74753-utf8-encoded.t

Log:
taking in v1.42 changes

Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Tue Mar 13 08:01:03 2012
@@ -18,6 +18,9 @@
  - clarification of when StrictlyTyped/DiscardString can be used and
    LongReadLen (Martin J. Evans)
 
+1.42      2012-03-13
+ - skip rt74753-utf8-encoded.t if db is not unicode
+
 1.40      2012-03-08
  - promote 1.39_00 to official release
 

Modified: dbd-oracle/trunk/t/rt74753-utf8-encoded.t
==============================================================================
--- dbd-oracle/trunk/t/rt74753-utf8-encoded.t	(original)
+++ dbd-oracle/trunk/t/rt74753-utf8-encoded.t	Tue Mar 13 08:01:03 2012
@@ -18,13 +18,13 @@
 $ENV{NLS_NCHAR} = 'UTF8';
 
 my $dbh = DBI->connect( $dsn, $dbuser, '',  { 
-        PrintError => 0, AutoCommit => 0});
-if (!$dbh) {
-    plan skip_all => 'Unable to connect to Oracle';
-} else {
-    plan tests => 3;
-    $dbh->{RaiseError} = 1;
-}
+    PrintError => 0, AutoCommit => 0
+});
+
+plan skip_all => "unable to connect to Oracle database" if not $dbh;
+plan skip_all => "database character set is not Unicode" unless db_ochar_is_utf($dbh);
+
+plan tests => 3;
 
 $dbh->do(q(alter session set nls_territory = 'GERMANY'));