X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle_blob.t;h=2a78d36fde21730cdd2619ad4f11fad03352868b;hb=fcdd56ca536a7751e2cf5a2c9ba62424c7f18122;hp=c94cec3a035eb033e58abae18973809cfd6a24f9;hpb=af1f4f842ae446a3339b92b33851ea80c928f17a;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/73oracle_blob.t b/t/73oracle_blob.t
index c94cec3..2a78d36 100644
--- a/t/73oracle_blob.t
+++ b/t/73oracle_blob.t
@@ -9,7 +9,6 @@ use DBIx::Class::Optional::Dependencies ();
 
 use lib qw(t/lib);
 use DBICTest;
-use DBIC::SqlMakerTest;
 
 my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_ORA_${_}" }  qw/DSN USER PASS/};
 
@@ -56,7 +55,6 @@ for my $opt (@tryopt) {
 
 sub _run_blob_tests {
 SKIP: {
-TODO: {
   my ($schema, $opt) = @_;
   my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
   $binstr{'large'} = $binstr{'small'} x 1024;
@@ -79,17 +77,12 @@ TODO: {
               . ': https://rt.cpan.org/Ticket/Display.html?id=64206'
     if $q;
 
-  # so we can disable BLOB mega-output
-  my $orig_debug = $schema->storage->debug;
-
   my $id;
   foreach my $size (qw( small large )) {
     $id++;
 
-    local $schema->storage->{debug} = $size eq 'large'
-      ? 0
-      : $orig_debug
-    ;
+    local $schema->storage->{debug} = 0
+      if $size eq 'large';
 
     my $str = $binstr{$size};
     lives_ok {
@@ -107,7 +100,7 @@ TODO: {
     ok (try { $objs[0]->blob }||'' eq "blob:$str", 'blob inserted/retrieved correctly');
     ok (try { $objs[0]->clob }||'' eq "clob:$str", 'clob inserted/retrieved correctly');
 
-    TODO: {
+    {
       local $TODO = '-like comparison on blobs not tested before ora 10 (fails on 8i)'
         if $schema->storage->_server_info->{normalized_dbms_version} < 10;
 
@@ -155,9 +148,7 @@ TODO: {
     @objs = $rs->search({ blob => "re-updated blob", clob => 're-updated clob' })->all;
     is @objs, 0, 'row deleted successfully';
   }
-
-  $schema->storage->debug ($orig_debug);
-}}
+}
 
   do_clean ($dbh);
 }
@@ -186,10 +177,9 @@ sub do_clean {
 }
 
 END {
-  for ($dbh) {
-    next unless $_;
+  if ($dbh) {
     local $SIG{__WARN__} = sub {};
-    do_clean($_);
-    $_->disconnect;
+    do_clean($dbh);
+    undef $dbh;
   }
 }