X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle_blob.t;h=3965ea3d16451ad84dbe5f3f4c5106d96ae068d8;hb=64819b0e69a844bb790701e13931afcc34f3d981;hp=46d91f110ada6ba1626e0c0480f6033c6981847a;hpb=1143e5bdc4571a4b6f601940643e611d969e2cfb;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/73oracle_blob.t b/t/73oracle_blob.t
index 46d91f1..3965ea3 100644
--- a/t/73oracle_blob.t
+++ b/t/73oracle_blob.t
@@ -24,12 +24,11 @@ $ENV{NLS_COMP} = "BINARY";
 $ENV{NLS_LANG} = "AMERICAN";
 
 my $v = do {
-  my $v = DBICTest::Schema->connect($dsn, $user, $pass)->storage->_dbh_get_info(18);
-  $v =~ /^(\d+)\.(\d+)/
-    or die "Unparseable Oracle server version: $v\n";
-
-  sprintf('%d.%03d', $1, $2);
+  my $si = DBICTest::Schema->connect($dsn, $user, $pass)->storage->_server_info;
+  $si->{normalized_dbms_version}
+    or die "Unparseable Oracle server version: $si->{dbms_version}\n";
 };
+
 ##########
 # the recyclebin (new for 10g) sometimes comes in the way
 my $on_connect_sql = $v >= 10 ? ["ALTER SESSION SET recyclebin = OFF"] : [];
@@ -187,10 +186,9 @@ sub do_clean {
 }
 
 END {
-  for ($dbh) {
-    next unless $_;
+  if ($dbh) {
     local $SIG{__WARN__} = sub {};
-    do_clean($_);
-    $_->disconnect;
+    do_clean($dbh);
+    undef $dbh;
   }
 }